[Haiku-commits] r31150 - haiku/trunk/build/jam

[bonefish at mail.berlios.de]

Author: bonefish
Date: 2009-06-21 12:59:34 +0200 (Sun, 21 Jun 2009)
New Revision: 31150
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=31150&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
* 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.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-06-21 10:57:01 UTC (rev 31149)
+++ haiku/trunk/build/jam/HaikuImage	2009-06-21 10:59:34 UTC (rev 31150)
@@ -78,7 +78,7 @@
 	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 <revisioned>libroot.so
@@ -233,12 +233,17 @@
 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 @@
 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 ;
 	}
 }