build-toolchain: more common path for gold ld

also remove obsolete TODO

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
This commit is contained in:
Wolfgang Wiedmeyer 2017-02-18 16:28:59 +01:00
parent d93a358a4a
commit 4971a943eb
No known key found for this signature in database
GPG Key ID: 5816A24C10757FC4

View File

@ -20,6 +20,9 @@ set -e
BASEDIR=$(pwd) BASEDIR=$(pwd)
GOLD_LD=/usr/bin/ld.gold
BFD_LD=/usr/bin/ld.bfd
mkdir -p $BASEDIR/toolchain/clang mkdir -p $BASEDIR/toolchain/clang
cd $BASEDIR/toolchain/clang cd $BASEDIR/toolchain/clang
@ -123,7 +126,7 @@ cd .. && mkdir -p gcc && cd gcc
--disable-libquadmath \ --disable-libquadmath \
--disable-libsanitizer \ --disable-libsanitizer \
--enable-languages=c,c++ \ --enable-languages=c,c++ \
--with-ld=/usr/bin/x86_64-linux-gnu-ld.gold --with-ld=$GOLD_LD
make -j $(nproc) make -j $(nproc)
make install make install
@ -135,9 +138,9 @@ ln -s ../../../../../../../../../bionic/libc/include/stdatomic.h stdatomic.h
# link ld from /usr # link ld from /usr
cd ../../../../../x86_64-linux/bin/ cd ../../../../../x86_64-linux/bin/
rm -f ld ld.gold ld.bfd rm -f ld ld.gold ld.bfd
ln -s /usr/bin/x86_64-linux-gnu-ld.gold ld ln -s "$GOLD_LD" ld
ln -s /usr/bin/x86_64-linux-gnu-ld.gold ld.gold ln -s "$GOLD_LD" ld.gold
ln -s /usr/bin/x86_64-linux-gnu-ld.bfd ld.bfd ln -s "$BFD_LD" ld.bfd
cd $BASEDIR cd $BASEDIR
@ -180,9 +183,3 @@ ant clean dist
cp ../../jack_jill/build/jill/dist/jill.jar ../../jack_jill/ cp ../../jack_jill/build/jill/dist/jill.jar ../../jack_jill/
cd $BASEDIR cd $BASEDIR
#TODO:
# search for binaries in external and remove them
# build manifest merger from source
# jack source has prebuilts