diff options
author | Alexey Neyman <stilor@att.net> | 2016-11-22 18:02:04 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-22 18:02:04 (GMT) |
commit | 0946ce59a09609b743b7dba40f7212778011f286 (patch) | |
tree | aa666685885104ed985b4c743ad3222968e7ae54 /scripts/build/debug | |
parent | 3eb2e351f02d82fad255a9e6433c4c4d659c5de0 (diff) | |
parent | 87bfd55b3b5329c7f306fa291ca5e0950a2c9da1 (diff) |
Merge pull request #479 from stilor/gmake-link-fix
Gmake link fix
Diffstat (limited to 'scripts/build/debug')
-rw-r--r-- | scripts/build/debug/000-template.sh | 4 | ||||
-rw-r--r-- | scripts/build/debug/100-dmalloc.sh | 6 | ||||
-rw-r--r-- | scripts/build/debug/200-duma.sh | 8 | ||||
-rw-r--r-- | scripts/build/debug/300-gdb.sh | 26 | ||||
-rw-r--r-- | scripts/build/debug/400-ltrace.sh | 4 | ||||
-rw-r--r-- | scripts/build/debug/500-strace.sh | 4 |
6 files changed, 26 insertions, 26 deletions
diff --git a/scripts/build/debug/000-template.sh b/scripts/build/debug/000-template.sh index d72069b..47d2cae 100644 --- a/scripts/build/debug/000-template.sh +++ b/scripts/build/debug/000-template.sh @@ -26,8 +26,8 @@ do_debug_foobar_build() { # --host=${CT_TARGET} \ # --prefix=/usr \ # --foobar-options - # CT_DoExecLog ALL ${make} - # CT_DoExecLog ALL ${make} DESTDIR="${CT_SYSROOT_DIR}" install + # CT_DoExecLog ALL make + # CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install # CT_Popd : } diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh index 1cfbdc0..ad0d78d 100644 --- a/scripts/build/debug/100-dmalloc.sh +++ b/scripts/build/debug/100-dmalloc.sh @@ -47,11 +47,11 @@ do_debug_dmalloc_build() { "${extra_config[@]}" CT_DoLog EXTRA "Building dmalloc" - CT_DoExecLog ALL ${make} + CT_DoExecLog ALL make CT_DoLog EXTRA "Installing dmalloc" - CT_DoExecLog ALL ${make} DESTDIR="${CT_SYSROOT_DIR}" installincs installlib - CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" installutil + CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" installincs installlib + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" installutil CT_EndStep } diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh index 4f6a5c3..a84366c 100644 --- a/scripts/build/debug/200-duma.sh +++ b/scripts/build/debug/200-duma.sh @@ -32,7 +32,7 @@ do_debug_duma_build() { # The shared library needs some love: some version have libduma.so.0.0, # while others have libduma.so.0.0.0 - duma_so=$(${make} -n -p 2>&1 |${grep} -E '^libduma.so[^:]*:' |head -n 1 |cut -d : -f 1) + duma_so=$(make -n -p 2>&1 |grep -E '^libduma.so[^:]*:' |head -n 1 |cut -d : -f 1) libs= [ "${CT_DUMA_A}" = "y" ] && libs="${libs} libduma.a" @@ -40,21 +40,21 @@ do_debug_duma_build() { libs="${libs# }" CT_DoLog EXTRA "Building libraries '${libs}'" CT_DoExecLog ALL \ - ${make} HOSTCC="${CT_BUILD}-gcc" \ + make HOSTCC="${CT_BUILD}-gcc" \ CC="${CT_TARGET}-gcc" \ CXX="${CT_TARGET}-gcc" \ RANLIB="${CT_TARGET}-ranlib" \ DUMA_CPP="${DUMA_CPP}" \ ${libs} CT_DoLog EXTRA "Installing libraries '${libs}'" - CT_DoExecLog ALL ${install} -m 644 ${libs} "${CT_SYSROOT_DIR}/usr/lib" + CT_DoExecLog ALL install -m 644 ${libs} "${CT_SYSROOT_DIR}/usr/lib" if [ "${CT_DUMA_SO}" = "y" ]; then CT_DoLog EXTRA "Installing shared library link" ln -vsf ${duma_so} "${CT_SYSROOT_DIR}/usr/lib/libduma.so" 2>&1 |CT_DoLog ALL CT_DoLog EXTRA "Installing wrapper script" mkdir -p "${CT_DEBUGROOT_DIR}/usr/bin" # Install a simpler, smaller, safer wrapper than the one provided by D.U.M.A. - ${sed} -r -e 's:^LIBDUMA_SO=.*:LIBDUMA_SO=/usr/lib/'"${duma_so}"':;' \ + sed -r -e 's:^LIBDUMA_SO=.*:LIBDUMA_SO=/usr/lib/'"${duma_so}"':;' \ "${CT_LIB_DIR}/scripts/build/debug/duma.in" \ >"${CT_DEBUGROOT_DIR}/usr/bin/duma" chmod 755 "${CT_DEBUGROOT_DIR}/usr/bin/duma" diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index ee4753e..3396836 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -12,10 +12,10 @@ do_debug_gdb_get() { else # Account for the Linaro versioning linaro_version="$( echo "${CT_GDB_VERSION}" \ - |${sed} -r -e 's/^linaro-//;' \ + |sed -r -e 's/^linaro-//;' \ )" linaro_series="$( echo "${linaro_version}" \ - |${sed} -r -e 's/-.*//;' \ + |sed -r -e 's/-.*//;' \ )" if [ x"${linaro_version}" = x"${CT_GDB_VERSION}" ]; then @@ -24,7 +24,7 @@ do_debug_gdb_get() { {http,ftp,https}://ftp.gnu.org/pub/gnu/gdb \ ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases else - YYMM=`echo ${CT_GDB_VERSION} |cut -d- -f3 |${sed} -e 's,^..,,'` + YYMM=`echo ${CT_GDB_VERSION} |cut -d- -f3 |sed -e 's,^..,,'` CT_GetFile "gdb-${CT_GDB_VERSION}" \ "http://launchpad.net/gdb-linaro/${linaro_series}/${linaro_version}/+download" \ https://releases.linaro.org/${YYMM}/components/toolchain/gdb-linaro \ @@ -128,15 +128,15 @@ do_debug_gdb_build() { "${CT_GDB_CROSS_EXTRA_CONFIG_ARRAY[@]}" CT_DoLog EXTRA "Building cross-gdb" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} CT_DoLog EXTRA "Installing cross-gdb" - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install if [ "${CT_BUILD_MANUALS}" = "y" ]; then CT_DoLog EXTRA "Building and installing the cross-GDB manuals" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} pdf html - CT_DoExecLog ALL ${make} install-{pdf,html}-gdb + CT_DoExecLog ALL make ${JOBSFLAGS} pdf html + CT_DoExecLog ALL make install-{pdf,html}-gdb fi if [ "${CT_GDB_INSTALL_GDBINIT}" = "y" ]; then @@ -145,11 +145,11 @@ do_debug_gdb_build() { if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ]; then gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ) else - gcc_version=$(${sed} -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \ + gcc_version=$(sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \ "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/version.c" \ ) fi - ${sed} -r \ + sed -r \ -e "s:@@PREFIX@@:${CT_PREFIX_DIR}:;" \ -e "s:@@VERSION@@:${gcc_version}:;" \ "${CT_LIB_DIR}/scripts/build/debug/gdbinit.in" \ @@ -230,10 +230,10 @@ do_debug_gdb_build() { "${native_extra_config[@]}" CT_DoLog EXTRA "Building native gdb" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC} + CT_DoExecLog ALL make ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC} CT_DoLog EXTRA "Installing native gdb" - CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" install + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install # Building a native gdb also builds a gdbserver find "${CT_DEBUGROOT_DIR}" -type f -name gdbserver -exec rm -fv {} \; 2>&1 |CT_DoLog ALL @@ -302,10 +302,10 @@ do_debug_gdb_build() { "${gdbserver_extra_config[@]}" CT_DoLog EXTRA "Building gdbserver" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC} + CT_DoExecLog ALL make ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC} CT_DoLog EXTRA "Installing gdbserver" - CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" install + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install CT_EndStep fi diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh index f8d6144..56f2580 100644 --- a/scripts/build/debug/400-ltrace.sh +++ b/scripts/build/debug/400-ltrace.sh @@ -52,10 +52,10 @@ do_debug_ltrace_build() { fi CT_DoLog EXTRA "Building ltrace" - CT_DoExecLog ALL ${make} + CT_DoExecLog ALL make CT_DoLog EXTRA "Installing ltrace" - CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" install + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install CT_Popd CT_EndStep diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh index 79406a7..0d33ca0 100644 --- a/scripts/build/debug/500-strace.sh +++ b/scripts/build/debug/500-strace.sh @@ -28,10 +28,10 @@ do_debug_strace_build() { --prefix=/usr CT_DoLog EXTRA "Building strace" - CT_DoExecLog ALL ${make} + CT_DoExecLog ALL make CT_DoLog EXTRA "Installing strace" - CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" install + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install CT_Popd CT_EndStep |