summaryrefslogtreecommitdiff
path: root/scripts/build/debug
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/build/debug')
-rw-r--r--scripts/build/debug/000-template.sh4
-rw-r--r--scripts/build/debug/100-dmalloc.sh6
-rw-r--r--scripts/build/debug/200-duma.sh10
-rw-r--r--scripts/build/debug/300-gdb.sh18
-rw-r--r--scripts/build/debug/400-ltrace.sh4
-rw-r--r--scripts/build/debug/500-strace.sh4
6 files changed, 23 insertions, 23 deletions
diff --git a/scripts/build/debug/000-template.sh b/scripts/build/debug/000-template.sh
index 47d2cae..d72069b 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 ad0d78d..1cfbdc0 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 aa722cb..4f6a5c3 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,22 +40,22 @@ 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}"':;' \
- "${CT_LIB_DIR}/scripts/build/debug/duma.in" \
+ ${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"
fi
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index c025458..8d3c46d 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -117,15 +117,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
@@ -134,7 +134,7 @@ 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
@@ -209,10 +209,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
@@ -276,10 +276,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 56f2580..f8d6144 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 0d33ca0..79406a7 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
generated by cgit v0.10.2-6-g49f6 at 2024-04-30 01:58:23 (GMT)