summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-18 16:28:59 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-18 16:28:59 +0100
commit4971a943eb2ef67bfb0976f276725f5399df10cb (patch)
treef9928b31cd433f7f97a6fe5c2e96a57ed6d3d12e
parentd93a358a4a9dccfb77b33479c94fe1ec3db9e406 (diff)
downloadvendor_replicant-4971a943eb2ef67bfb0976f276725f5399df10cb.zip
vendor_replicant-4971a943eb2ef67bfb0976f276725f5399df10cb.tar.gz
vendor_replicant-4971a943eb2ef67bfb0976f276725f5399df10cb.tar.bz2
build-toolchain: more common path for gold ld
also remove obsolete TODO Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rwxr-xr-xbuild-toolchain17
1 files changed, 7 insertions, 10 deletions
diff --git a/build-toolchain b/build-toolchain
index c6c653b..727bd81 100755
--- a/build-toolchain
+++ b/build-toolchain
@@ -20,6 +20,9 @@ set -e
BASEDIR=$(pwd)
+GOLD_LD=/usr/bin/ld.gold
+BFD_LD=/usr/bin/ld.bfd
+
mkdir -p $BASEDIR/toolchain/clang
cd $BASEDIR/toolchain/clang
@@ -123,7 +126,7 @@ cd .. && mkdir -p gcc && cd gcc
--disable-libquadmath \
--disable-libsanitizer \
--enable-languages=c,c++ \
- --with-ld=/usr/bin/x86_64-linux-gnu-ld.gold
+ --with-ld=$GOLD_LD
make -j $(nproc)
make install
@@ -135,9 +138,9 @@ ln -s ../../../../../../../../../bionic/libc/include/stdatomic.h stdatomic.h
# link ld from /usr
cd ../../../../../x86_64-linux/bin/
rm -f ld ld.gold ld.bfd
-ln -s /usr/bin/x86_64-linux-gnu-ld.gold ld
-ln -s /usr/bin/x86_64-linux-gnu-ld.gold ld.gold
-ln -s /usr/bin/x86_64-linux-gnu-ld.bfd ld.bfd
+ln -s "$GOLD_LD" ld
+ln -s "$GOLD_LD" ld.gold
+ln -s "$BFD_LD" ld.bfd
cd $BASEDIR
@@ -180,9 +183,3 @@ ant clean dist
cp ../../jack_jill/build/jill/dist/jill.jar ../../jack_jill/
cd $BASEDIR
-
-
-#TODO:
-# search for binaries in external and remove them
-# build manifest merger from source
-# jack source has prebuilts