daniel/danio_toolchain
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Daniel
2019-10-18 20:31:00 +02:00
parent 2c9b8a846a
commit 11d68414e8
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
danio_gcc.sh
+11 -10
View File
@@ -83,10 +83,6 @@ runit()
#(cd gcc-dl; ln -svf ../newlib-dl/newlib newlib; ln -svf ../newlib-dl/libgloss libgloss) || return ${?} #(cd gcc-dl; ln -svf ../newlib-dl/newlib newlib; ln -svf ../newlib-dl/libgloss libgloss) || return ${?}
make -C build-gcc -j${nproc} all-target-libgcc || return ${?} make -C build-gcc -j${nproc} all-target-libgcc || return ${?}
make -C build-gcc -j${nproc} install-target-libgcc || return ${?} make -C build-gcc -j${nproc} install-target-libgcc || return ${?}
make -C build-gcc -j${nproc} all-target-libstdc++-v3 || return ${?}
make -C build-gcc -j${nproc} install-target-libstdc++-v3 || return ${?}
#make -C build-gcc -j${nproc} || return ${?}
#make -C build-gcc -j${nproc} install || return ${?}
else else
mkdir -pv build-glibc || return ${?} mkdir -pv build-glibc || return ${?}
env CC="${TARGET}-gcc" CXX="${TARGET}-g++" sh -c '(cd build-glibc; ../glibc-dl/configure --prefix="${PREFIX}/${TARGET}" --host="${TARGET}" --with-headers="${PREFIX}/${TARGET}/include" --with-pkgversion="*DANiO* GLIBC (`echo ${TARGET} | cut -f 1 -d '-'`)" --enable-add-ons ${ARGS})' || return ${?} env CC="${TARGET}-gcc" CXX="${TARGET}-g++" sh -c '(cd build-glibc; ../glibc-dl/configure --prefix="${PREFIX}/${TARGET}" --host="${TARGET}" --with-headers="${PREFIX}/${TARGET}/include" --with-pkgversion="*DANiO* GLIBC (`echo ${TARGET} | cut -f 1 -d '-'`)" --enable-add-ons ${ARGS})' || return ${?}
@@ -100,9 +96,9 @@ runit()
make -C build-gcc -j${nproc} install-target-libgcc || return ${?} make -C build-gcc -j${nproc} install-target-libgcc || return ${?}
make -C build-glibc -j${nproc} || return ${?} make -C build-glibc -j${nproc} || return ${?}
make -C build-glibc -j${nproc} install || return ${?} make -C build-glibc -j${nproc} install || return ${?}
fi
make -C build-gcc -j${nproc} all-target-libstdc++-v3 || return ${?} make -C build-gcc -j${nproc} all-target-libstdc++-v3 || return ${?}
make -C build-gcc -j${nproc} install-target-libstdc++-v3 || return ${?} make -C build-gcc -j${nproc} install-target-libstdc++-v3 || return ${?}
fi
} }
strip_n_pack() strip_n_pack()
{ {
@@ -113,15 +109,15 @@ runit()
find ${PREFIX}/${TARGET} -type f | xargs file | grep "ELF" | cut -f 1 -d ":" | xargs ${TARGET}-strip -S --strip-unneeded #for sysroot find ${PREFIX}/${TARGET} -type f | xargs file | grep "ELF" | cut -f 1 -d ":" | xargs ${TARGET}-strip -S --strip-unneeded #for sysroot
if [ "${buildnewlib}" -ne "0" ]; then if [ "${buildnewlib}" -ne "0" ]; then
if [ "${1}" = "64" ]; then if [ "${1}" = "64" ]; then
(cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-64.txz" ${TARGET}) #|| return ${?} (cd rel-bin; tar -cJf "${OUT}/${TARGET}-GCC_${gcc_version}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-64.txz" ${TARGET}) #|| return ${?}
else else
(cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) #|| return ${?} (cd rel-bin; tar -cJf "${OUT}/${TARGET}-GCC_${gcc_version}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) #|| return ${?}
fi fi
else else
if [ "${1}" = "64" ]; then if [ "${1}" = "64" ]; then
(cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-64.txz" ${TARGET}) #|| return ${?} (cd rel-bin; tar -cJf "${OUT}/${TARGET}-GCC_${gcc_version}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-64.txz" ${TARGET}) #|| return ${?}
else else
(cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) #|| return ${?} (cd rel-bin; tar -cJf "${OUT}/${TARGET}-GCC_${gcc_version}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) #|| return ${?}
fi fi
fi fi
} }
@@ -195,6 +191,11 @@ choose_sub()
done done
} }
if ! command -v jq >/dev/null; then
echo "jq command not found, please install it before using this application!"
exit 1
fi
targets="`grep ' - t=' .travis.yml | cut -f 2 -d = | cut -f 1 -d ' ' | sort -u`" targets="`grep ' - t=' .travis.yml | cut -f 2 -d = | cut -f 1 -d ' ' | sort -u`"
if [ "${AUTOBUILD}" -ne "0" ]; then if [ "${AUTOBUILD}" -ne "0" ]; then
export clean="1" export clean="1"
@@ -317,7 +318,7 @@ else
export glibc_version="master" export glibc_version="master"
export linux_version="master" export linux_version="master"
export gcc_version="master" export gcc_version="master"
export newlib_version="master"
fi fi
export newlib_version="master"
runit "${arch}-danio-${BASE}" "${BINARY}" runit "${arch}-danio-${BASE}" "${BINARY}"
fi fi