From 3761bc3ed7bc245e5ba4119136e6e33698b30300 Mon Sep 17 00:00:00 2001 From: VAN BOSSUYT Nicolas Date: Thu, 25 Apr 2019 19:28:10 +0200 Subject: [PATCH] =?UTF-8?q?Toolchain:=20The=20toolchain=20script=20is=20no?= =?UTF-8?q?w=20working=20=F0=9F=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LibC/Makefile | 6 +++--- LibM/Makefile | 5 +++++ Toolchain/BuildIt.sh | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/LibC/Makefile b/LibC/Makefile index 67cc90cc71..0a0190ff26 100644 --- a/LibC/Makefile +++ b/LibC/Makefile @@ -82,6 +82,6 @@ install: $(LIBRARY) rsync -a --include '*/' --include '*.h' --exclude '*' . ../Base/usr/include # Install the library cp $(LIBRARY) ../Base/usr/lib - cp crt0.o ../Base/usr/lib/ - cp crti.ao ../Base/usr/lib/crti.o - cp crtn.ao ../Base/usr/lib/crtn.o \ No newline at end of file + cp crt0.o ../Base/usr/lib/ + cp crti.ao ../Base/usr/lib/crti.o + cp crtn.ao ../Base/usr/lib/crtn.o \ No newline at end of file diff --git a/LibM/Makefile b/LibM/Makefile index a6ab715693..33a4e382fe 100644 --- a/LibM/Makefile +++ b/LibM/Makefile @@ -21,3 +21,8 @@ $(LIBRARY): $(OBJS) clean: @echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d +install: $(LIBRARY) + # Copy headers + rsync -a --include '*/' --include '*.h' --exclude '*' . ../Base/usr/include + # Install the library + cp $(LIBRARY) ../Base/usr/lib \ No newline at end of file diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh index 2d4d911d12..d5225c9e93 100644 --- a/Toolchain/BuildIt.sh +++ b/Toolchain/BuildIt.sh @@ -9,6 +9,8 @@ SYSROOT="$DIR/../Base" mkdir -p "$DIR/Tarballs" +source "$DIR/UseIt.sh" + pushd "$DIR/Tarballs" if [ ! -e "binutils-2.32.tar.gz" ]; then wget "http://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.gz" @@ -71,7 +73,8 @@ pushd "$DIR/Build/" make -j $(nproc) all-gcc all-target-libgcc make install-gcc install-target-libgcc - make -c ../LibC/ install + make -C "$DIR/../LibC/" install + make -C "$DIR/../LibM/" install make all-target-libstdc++-v3 make install-target-libstdc++-v3