From 7c40979456325f5d6f0defb1c7b2d659a215a5c4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 21 Jun 2009 10:59:34 +0000 Subject: [PATCH] * Create the symlinks for the alternative gcc in the correct subdirectory. 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 --- build/jam/HaikuImage | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 797e726c82..16a559484a 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -78,7 +78,7 @@ SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo GLDirectMode GLTeapot Mandelbrot Pairs 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 libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so libdevice.so libgame.so libscreensaver.so libroot.so @@ -233,12 +233,17 @@ AddFilesToHaikuHybridImage system lib : $(SYSTEM_LIBS) : : true ; SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ; -local lib ; -for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) { - AddSymlinkToHaikuHybridImage system lib : libnetwork.so : $(lib) ; +if $(HAIKU_GCC_VERSION[1]) = 2 { + local 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 SYSTEM_LIBS_LIBGL_ALIASES @@ -247,7 +252,7 @@ SYSTEM_LIBS_LIBGL_ALIASES if $(TARGET_ARCH) = x86 { local lib ; for lib in $(SYSTEM_LIBS_LIBGL_ALIASES) { - AddSymlinkToHaikuHybridImage system lib : libGL.so : $(lib) ; + AddSymlinkToHaikuHybridImage system lib : libGL.so : $(lib) : : true ; } }