changeset 1828:297a5d07c73b

There are some uses of ${ARCH}-cc and ${ARCH}-strip remaining in root-filesystem.sh. Below is a patch to replace them with ${CC_PREFIX}. Also I'll first sneak in a small patch to change PS1 in init.sh to expand the HOST and CPUS vars.
author Geoff Salmon <geoff@se-instruments.com>
date Thu, 10 Dec 2015 01:43:42 -0600
parents c7b90f8d1b80
children c2e158a22d2b
files root-filesystem.sh sources/root-filesystem/sbin/init.sh
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/root-filesystem.sh	Wed Dec 09 15:29:23 2015 -0600
+++ b/root-filesystem.sh	Thu Dec 10 01:43:42 2015 -0600
@@ -54,12 +54,12 @@
 # Put statically and dynamically linked hello world programs on there for
 # test purposes.
 
-"${ARCH}-cc" "${SOURCES}/root-filesystem/src/hello.c" -Os $CFLAGS \
+"${CC_PREFIX}cc" "${SOURCES}/root-filesystem/src/hello.c" -Os $CFLAGS \
   -o "$STAGE_USR/bin/hello-dynamic" || dienow
 
 if [ "$BUILD_STATIC" != none ]
 then
-  "${ARCH}-cc" "${SOURCES}/root-filesystem/src/hello.c" -Os $CFLAGS -static \
+  "${CC_PREFIX}cc" "${SOURCES}/root-filesystem/src/hello.c" -Os $CFLAGS -static \
     -o "$STAGE_USR/bin/hello-static" || dienow
   STATIC=--static
 else
@@ -68,7 +68,7 @@
 
 # Debug wrapper for use with /usr/src/record-commands.sh
 
-"${ARCH}-cc" "$SOURCES/toys/wrappy.c" -Os $CFLAGS $STATIC \
+"${CC_PREFIX}cc" "$SOURCES/toys/wrappy.c" -Os $CFLAGS $STATIC \
   -o "$STAGE_USR/bin/record-commands-wrapper" || dienow
 
 # Do we need shared libraries?
@@ -78,18 +78,18 @@
   echo Copying compiler libraries...
   mkdir -p "$STAGE_USR/lib" || dienow
   (path_search \
-     "$("$ARCH-cc" --print-search-dirs | sed -n 's/^libraries: =*//p')" \
+     "$("${CC_PREFIX}cc" --print-search-dirs | sed -n 's/^libraries: =*//p')" \
       "*.so*" 'cp -H "$DIR/$FILE" "$STAGE_USR/lib/$FILE"' \
       || dienow) | dotprogress
 
   [ -z "$SKIP_STRIP" ] &&
-    "${ARCH}-strip" --strip-unneeded "$STAGE_USR"/lib/*.so
+    "${CC_PREFIX}strip" --strip-unneeded "$STAGE_USR"/lib/*.so
 fi
 
 # Clean up and package the result
 
 [ -z "$SKIP_STRIP" ] &&
-  "${ARCH}-strip" "$STAGE_USR"/{bin/*,sbin/*}
+  "${CC_PREFIX}strip" "$STAGE_USR"/{bin/*,sbin/*}
 
 create_stage_tarball
 
--- a/sources/root-filesystem/sbin/init.sh	Wed Dec 09 15:29:23 2015 -0600
+++ b/sources/root-filesystem/sbin/init.sh	Thu Dec 10 01:43:42 2015 -0600
@@ -20,7 +20,7 @@
   export CPUS=$(echo /sys/devices/system/cpu/cpu[0-9]* | wc -w)
   [ "$CPUS" -lt 1 ] && CPUS=1
 fi
-export PS1='($HOST:$CPUS) \w \$ '
+export PS1="($HOST:$CPUS) \w \$ "
 
 # When running under qemu, do some more setup
 if [ $$ -eq 1 ]