Ticket #5518: 5518.patch

build/jam/OptionalPackages

@@ -400 +400 @@
         # 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) {
+            if $(HAIKU_GCC_VERSION[1]) < 4 {
+                # we are a gcc2hybrid
+                AddSymlinkToHaikuHybridImage develop abi x86 gcc4 tools current lib
+                    : /system/lib/gcc4 $(lib) : : true ;
+            } else {
+                # we are a gcc4 or gcc4hybrid
+                AddSymlinkToHaikuHybridImage develop abi x86 gcc4 tools current lib
+                    : /system/lib $(lib) : : true ;
+            }
+        }
     }
 
     # other commonly used tools