diff options
author | Dmitry Pankratov <dp@ubiquitech.com> | 2016-10-01 20:43:56 (GMT) |
---|---|---|
committer | Dmitry Pankratov <dp@ubiquitech.com> | 2016-10-01 20:43:56 (GMT) |
commit | 34ca68e3b076f4a7eea78aa46215fa50dfb1e322 (patch) | |
tree | 2d8f667a234d6ea577ebb1435f18db60eec3805b /scripts/build/internals.sh | |
parent | 11b20626b0d33624249f2609177f768a39cb70cf (diff) | |
parent | 531eab4c5650c7d51fa1c527c370b690ac50a8ab (diff) |
Merge branch 'master' of https://github.com/crosstool-ng/crosstool-ng
Diffstat (limited to 'scripts/build/internals.sh')
-rw-r--r-- | scripts/build/internals.sh | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index a2351ac..3f0260e 100644 --- a/scripts/build/internals.sh +++ b/scripts/build/internals.sh @@ -8,6 +8,7 @@ do_finish() { local _type local strip_args local gcc_version + local exe_suffix CT_DoStep INFO "Cleaning-up the toolchain's directory" @@ -20,13 +21,21 @@ do_finish() { strip_args="--strip-all -v" ;; esac + case "$CT_TARGET" in + *mingw*) + exe_suffix=".exe" + ;; + *) + exe_suffix="" + ;; + esac CT_DoLog INFO "Stripping all toolchain executables" CT_Pushd "${CT_PREFIX_DIR}" # Strip gdbserver if [ "${CT_GDB_GDBSERVER}" = "y" ]; then CT_DoExecLog ALL "${CT_TARGET}-strip" ${strip_args} \ - "${CT_TARGET}/debug-root/usr/bin/gdbserver" + "${CT_TARGET}/debug-root/usr/bin/gdbserver${exe_suffix}" fi if [ "${CT_CC_gcc}" = "y" ]; then # We can not use the version in CT_CC_GCC_VERSION because @@ -64,6 +73,7 @@ do_finish() { CT_DoLog EXTRA "Installing the populate helper" ${sed} -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \ -e 's|@@CT_install@@|'"${install}"'|g;' \ + -e 's|@@CT_awk@@|'"${awk}"'|g;' \ -e 's|@@CT_bash@@|'"${bash}"'|g;' \ -e 's|@@CT_grep@@|'"${grep}"'|g;' \ -e 's|@@CT_make@@|'"${make}"'|g;' \ @@ -118,12 +128,5 @@ do_finish() { CT_DoForceRmdir "${CT_DEBUGROOT_DIR}/"{,usr/}{,share/}{man,info} fi - # Remove the lib* symlinks, now: - # The symlinks are needed only during the build process. - # The final gcc will still search those dirs, but will also search - # the standard lib/ dirs, so we can get rid of the symlinks - CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/lib32" - CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/lib64" - CT_EndStep } |