diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2015-11-17 10:48:09 (GMT) |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-17 10:48:09 (GMT) |
| commit | 6f8e89cb5ca061e899bf3feaaf3fecf30d366c3e (patch) | |
| tree | 9eb19260dd694fa6b4852c46e3f0a93939db9a24 /scripts/build/libc/uClibc.sh | |
| parent | 6ac8e31a519f41af7838bb5261e0fe989fb428bd (diff) | |
consistency: Use exported variables of required tools
We check for apps:
* make
* sed
* grep
* awk
* libtool/libtoolize
* install
* patch
* and more
...during configure. Our scripts should be consistent about using the
variables that define where the found tool was found.
Of course, we do hard-link these tools in buildtools, but that should be
a backup for the components we are building. Our scripts should always
use the tools we find.
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'scripts/build/libc/uClibc.sh')
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index f49fd08..07c1ec7 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -107,7 +107,7 @@ do_libc_start_files() { # newer ones that are referenced are not available CT_DoLog EXTRA "Applying configuration" CT_DoYes "" |CT_DoExecLog ALL \ - make CROSS_COMPILE="${cross}" \ + ${make} CROSS_COMPILE="${cross}" \ UCLIBC_EXTRA_CFLAGS="-pipe" \ PREFIX="${CT_SYSROOT_DIR}/" \ LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \ @@ -115,7 +115,7 @@ do_libc_start_files() { CT_DoLog EXTRA "Building headers" CT_DoExecLog ALL \ - make ${CT_LIBC_UCLIBC_VERBOSITY} \ + ${make} ${CT_LIBC_UCLIBC_VERBOSITY} \ CROSS_COMPILE="${cross}" \ UCLIBC_EXTRA_CFLAGS="-pipe" \ PREFIX="${CT_SYSROOT_DIR}/" \ @@ -124,7 +124,7 @@ do_libc_start_files() { CT_DoLog EXTRA "Installing headers" CT_DoExecLog ALL \ - make ${CT_LIBC_UCLIBC_VERBOSITY} \ + ${make} ${CT_LIBC_UCLIBC_VERBOSITY} \ CROSS_COMPILE="${cross}" \ UCLIBC_EXTRA_CFLAGS="-pipe" \ PREFIX="${CT_SYSROOT_DIR}/" \ @@ -134,7 +134,7 @@ do_libc_start_files() { if [ "${CT_THREADS}" = "nptl" ]; then CT_DoLog EXTRA "Building start files" CT_DoExecLog ALL \ - make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} \ + ${make} ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} \ CROSS_COMPILE="${cross}" \ UCLIBC_EXTRA_CFLAGS="-pipe" \ PREFIX="${CT_SYSROOT_DIR}/" \ @@ -154,12 +154,12 @@ do_libc_start_files() { -o libdummy.so CT_DoLog EXTRA "Installing start files" - CT_DoExecLog ALL install -m 0644 lib/crt1.o lib/crti.o lib/crtn.o \ + CT_DoExecLog ALL ${install} -m 0644 lib/crt1.o lib/crti.o lib/crtn.o \ "${CT_SYSROOT_DIR}/usr/lib" CT_DoLog EXTRA "Installing dummy shared libs" - CT_DoExecLog ALL install -m 0755 libdummy.so "${CT_SYSROOT_DIR}/usr/lib/libc.so" - CT_DoExecLog ALL install -m 0755 libdummy.so "${CT_SYSROOT_DIR}/usr/lib/libm.so" + CT_DoExecLog ALL ${install} -m 0755 libdummy.so "${CT_SYSROOT_DIR}/usr/lib/libc.so" + CT_DoExecLog ALL ${install} -m 0755 libdummy.so "${CT_SYSROOT_DIR}/usr/lib/libm.so" fi # CT_THREADS == nptl CT_EndStep @@ -187,7 +187,7 @@ do_libc() { # use LIBC_EXTRA_CFLAGS here. CT_DoLog EXTRA "Applying configuration" CT_DoYes "" |CT_DoExecLog CFG \ - make CROSS_COMPILE=${CT_TARGET}- \ + ${make} CROSS_COMPILE=${CT_TARGET}- \ UCLIBC_EXTRA_CFLAGS="-pipe" \ PREFIX="${CT_SYSROOT_DIR}/" \ LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \ @@ -198,7 +198,7 @@ do_libc() { # /Old/ versions can not build in // CT_DoLog EXTRA "Building C library" CT_DoExecLog ALL \ - make -j1 \ + ${make} -j1 \ CROSS_COMPILE=${CT_TARGET}- \ UCLIBC_EXTRA_CFLAGS="-pipe" \ PREFIX="${CT_SYSROOT_DIR}/" \ @@ -207,7 +207,7 @@ do_libc() { LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \ pregen CT_DoExecLog ALL \ - make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} \ + ${make} ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} \ CROSS_COMPILE=${CT_TARGET}- \ UCLIBC_EXTRA_CFLAGS="-pipe" \ PREFIX="${CT_SYSROOT_DIR}/" \ @@ -232,7 +232,7 @@ do_libc() { # CT_DoLog EXTRA "Installing C library" CT_DoExecLog ALL \ - make CROSS_COMPILE=${CT_TARGET}- \ + ${make} CROSS_COMPILE=${CT_TARGET}- \ UCLIBC_EXTRA_CFLAGS="-pipe" \ PREFIX="${CT_SYSROOT_DIR}/" \ STRIPTOOL=true \ |