[haiku-commits] Re: r35746 - haiku/trunk/build/jam
- From: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 26 Mar 2010 15:05:02 +0100
Hi Matt,
On 2010-03-26 at 08:26:40 [+0100], Matt Madia <mattmadia@xxxxxxxxx> wrote:
> On Wed, Mar 3, 2010 at 17:44, <zooey@xxxxxxxxxxxxxxx> wrote:
> > Author: zooey
[ ... ]
> > 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
>
> I don't think this fixed the symlinks on gcc4hybrids
> {{{
> /Haiku1> ls system/lib/libs*.so
> system/lib/libscreensaver.so system/lib/libstdc++.so system/lib/libsupc++.so
>
> /Haiku1> ls system/lib/gcc2/libs*.so
> system/lib/gcc2/libscreensaver.so system/lib/gcc2/libsocket.so
> system/lib/gcc2/libstdc++.r4.so
>
> /Haiku1> ls -l develop/abi/x86/gcc4/tools/gcc-4.3.3-haiku-090629/lib/*.so
> <snip> develop/abi/x86/gcc4/tools/gcc-4.3.3-haiku-090629/lib/libstdc++.so
> -> /system/lib/gcc2/libstdc++.so
> <snip> develop/abi/x86/gcc4/tools/gcc-4.3.3-haiku-090629/lib/libsupc++.so
> -> /system/lib/gcc2/libsupc++.so
> }}}
Right, I had not tested with gcc4hybrid, but you are right - it doesn't work.
> Should I just go ahead and commit this or re-open #5518?
Yup, please go ahead and commit.
cheers,
Oliver
Other related posts:
