[haiku-commits] r35746 - haiku/trunk/build/jam

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 3 Mar 2010 22:44:12 +0100 (CET)

Author: zooey
Date: 2010-03-03 22:44:12 +0100 (Wed, 03 Mar 2010)
New Revision: 35746
Changeset: http://dev.haiku-os.org/changeset/35746/haiku
Ticket: http://dev.haiku-os.org/ticket/5518

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Fixing #5518:
* applied Matt's patch (somewhat changed) that corrects the links for gcc4's
  libstdc++.so and libsupc++.so in case of a gcc2 hybrid (they must point
  to /system/lib/gcc4/... instead of /system/lib/...)


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2010-03-03 21:02:34 UTC (rev 
35745)
+++ haiku/trunk/build/jam/OptionalPackages      2010-03-03 21:44:12 UTC (rev 
35746)
@@ -400,6 +400,14 @@
                # symlink cpp to g++'s headers
                AddSymlinkToHaikuImage develop abi x86 gcc4 headers
                        : ../tools/current/include/g++ : cpp ;
+
+               # symlink to the appropriate system/lib[/gcc4] folder
+               local libs = libstdc++.so libsupc++.so ;
+               for lib in $(libs) {
+                       AddSymlinkToHaikuHybridImage
+                               develop abi x86 gcc4 tools 
gcc-4.3.3-haiku-090629 lib
+                               : /system/lib $(lib) : : true ;
+               }
        }
 
        # other commonly used tools


Other related posts: