Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Create the symlinks for the alternative gcc in the correct subdirectory.

Browse Source 
Fixes bug #4035.
* Create the libnetwork.so compatibility symlinks only for gcc 2.
* Install only the shared libstdc++ to /system/lib.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31150 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-06-21 10:59:34 +00:00
parent e20c80b57f
commit 7c40979456
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/jam/HaikuImage
View File

@ -78,7 +78,7 @@ SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
GLDirectMode GLTeapot Mandelbrot Pairs GLDirectMode GLTeapot Mandelbrot Pairs
Playground Pulse Sudoku Gradients Playground Pulse Sudoku Gradients
; ;
SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so SYSTEM_LIBS = libbe.so $(HAIKU_SHARED_LIBSTDC++) libmedia.so libtracker.so
libtranslation.so libbnetapi.so libnetwork.so libdebug.so libbsd.so libtranslation.so libbnetapi.so libnetwork.so libdebug.so libbsd.so
libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so
libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
@ -233,12 +233,17 @@ AddFilesToHaikuHybridImage system lib : $(SYSTEM_LIBS) : : true ;
SYSTEM_LIBS_LIBNETWORK_ALIASES SYSTEM_LIBS_LIBNETWORK_ALIASES
= libsocket.so libbind.so libnet.so ; = libsocket.so libbind.so libnet.so ;
local lib ; if $(HAIKU_GCC_VERSION[1]) = 2 {
for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) { local lib ;
AddSymlinkToHaikuHybridImage system lib : libnetwork.so : $(lib) ; for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) {
AddSymlinkToHaikuHybridImage system lib : libnetwork.so : $(lib)
: : true ;
}
AddSymlinkToHaikuHybridImage system lib : libbnetapi.so : libnetapi.so
: : true ;
} }
AddSymlinkToHaikuHybridImage system lib : libbnetapi.so : libnetapi.so ;
# libGL.so has GLU (like BeOS) *and* GLUT API built-in # libGL.so has GLU (like BeOS) *and* GLUT API built-in
SYSTEM_LIBS_LIBGL_ALIASES SYSTEM_LIBS_LIBGL_ALIASES
@ -247,7 +252,7 @@ SYSTEM_LIBS_LIBGL_ALIASES
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 {
local lib ; local lib ;
for lib in $(SYSTEM_LIBS_LIBGL_ALIASES) { for lib in $(SYSTEM_LIBS_LIBGL_ALIASES) {
AddSymlinkToHaikuHybridImage system lib : libGL.so : $(lib) ; AddSymlinkToHaikuHybridImage system lib : libGL.so : $(lib) : : true ;
} }
} }