diff options
| author | peter <peter@FreeBSD.org> | 2004-09-16 01:41:11 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2004-09-16 01:41:11 +0000 |
| commit | 942021ba90d83665505ecb9bb164a0f67a130063 (patch) | |
| tree | 6cce04606286e557cca9e62f6d7bb49af0d7c857 /tools/lib32 | |
| parent | b402daf66a99efb7dd14924ac1b96d114795af78 (diff) | |
| download | FreeBSD-src-942021ba90d83665505ecb9bb164a0f67a130063.zip FreeBSD-src-942021ba90d83665505ecb9bb164a0f67a130063.tar.gz | |
Update path to c++ internals includes for the 3.4 location.
No longer use make -k since the libraries target should build now.
Remove hacks for gnu/lib/libregex.
Diffstat (limited to 'tools/lib32')
| -rw-r--r-- | tools/lib32/build32.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tools/lib32/build32.sh b/tools/lib32/build32.sh index 8dfcbe5..45baad5 100644 --- a/tools/lib32/build32.sh +++ b/tools/lib32/build32.sh @@ -25,7 +25,7 @@ rm -rf $MAKEOBJDIRPREFIX mkdir -p $MAKEOBJDIRPREFIX CCARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" -CXXARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include/c++/3.3 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" +CXXARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include/c++/3.4 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" # and a place to put the alternate include tree into. mkdir -p $MAKEOBJDIRPREFIX/root @@ -55,14 +55,7 @@ export CC="cc $CCARGS" export CXX="c++ $CXXARGS" export LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" export AS="as --32" -make -s -DNO_BIND -DNOMAN -DNODOC -DNOINFO -k libraries - -# Hack to fix gnuregex which does hacks to the -I path based on $DESTDIR. But, we cannot -# use DESTDIR during the libraries target, because we're just using alternate includes, not -# an alternate install directory. -unset CC -export CC="cc -I/tmp/i386/root/usr/include/gnu $CCARGS" -(cd gnu/lib/libregex; make -k -DNOMAN -DNODOC -DNOINFO all install) +make -s -DNO_BIND -DNOMAN -DNODOC -DNOINFO libraries # and now that we have enough libraries, build ld-elf32.so.1 cd libexec/rtld-elf |
