1.1 --- a/scripts/crosstool.sh Thu May 15 20:42:45 2008 +0000
1.2 +++ b/scripts/crosstool.sh Tue May 20 21:32:39 2008 +0000
1.3 @@ -20,8 +20,8 @@
1.4 # - initialise logging.
1.5 . "${CT_LIB_DIR}/scripts/functions"
1.6
1.7 -CT_STAR_DATE=`CT_DoDate +%s%N`
1.8 -CT_STAR_DATE_HUMAN=`CT_DoDate +%Y%m%d.%H%M%S`
1.9 +CT_STAR_DATE=$(CT_DoDate +%s%N)
1.10 +CT_STAR_DATE_HUMAN=$(CT_DoDate +%Y%m%d.%H%M%S)
1.11
1.12 # Are we configured? We'll need that later...
1.13 CT_TestOrAbort "Configuration file not found. Please create one." -f "${CT_TOP_DIR}/.config"
1.14 @@ -104,12 +104,12 @@
1.15 fi
1.16
1.17 # Make all path absolute, it so much easier!
1.18 -CT_LOCAL_TARBALLS_DIR="`CT_MakeAbsolutePath \"${CT_LOCAL_TARBALLS_DIR}\"`"
1.19 +CT_LOCAL_TARBALLS_DIR=$(CT_MakeAbsolutePath "${CT_LOCAL_TARBALLS_DIR}")
1.20
1.21 # If the local tarball directory does not exist, say so, and don't try to save there!
1.22 if [ ! -d "${CT_LOCAL_TARBALLS_DIR}" ]; then
1.23 - CT_DoLog WARN "Directory \"${CT_LOCAL_TARBALLS_DIR}\" does not exist. Will not save downloaded tarballs to local storage."
1.24 - CT_SAVE_TARBALLS=""
1.25 + CT_DoLog WARN "Directory '${CT_LOCAL_TARBALLS_DIR}' does not exist. Will not save downloaded tarballs to local storage."
1.26 + CT_SAVE_TARBALLS=
1.27 fi
1.28
1.29 # Some more sanity checks now that we have all paths set up
1.30 @@ -119,23 +119,23 @@
1.31
1.32 # Check now if we can write to the destination directory:
1.33 if [ -d "${CT_INSTALL_DIR}" ]; then
1.34 - CT_TestAndAbort "Destination directory \"${CT_INSTALL_DIR}\" is not removable" ! -w `dirname "${CT_INSTALL_DIR}"`
1.35 + CT_TestAndAbort "Destination directory '${CT_INSTALL_DIR}' is not removable" ! -w $(dirname "${CT_INSTALL_DIR}")
1.36 fi
1.37
1.38 # Good, now grab a bit of informations on the system we're being run on,
1.39 # just in case something goes awok, and it's not our fault:
1.40 -CT_SYS_USER="`id -un`"
1.41 -CT_SYS_HOSTNAME=`hostname -f 2>/dev/null || true`
1.42 +CT_SYS_USER=$(id -un)
1.43 +CT_SYS_HOSTNAME=$(hostname -f 2>/dev/null || true)
1.44 # Hmmm. Some non-DHCP-enabled machines do not have an FQDN... Fall back to node name.
1.45 -CT_SYS_HOSTNAME="${CT_SYS_HOSTNAME:-`uname -n`}"
1.46 -CT_SYS_KERNEL=`uname -s`
1.47 -CT_SYS_REVISION=`uname -r`
1.48 +CT_SYS_HOSTNAME="${CT_SYS_HOSTNAME:-$(uname -n)}"
1.49 +CT_SYS_KERNEL=$(uname -s)
1.50 +CT_SYS_REVISION=$(uname -r)
1.51 # MacOS X lacks '-o' :
1.52 -CT_SYS_OS=`uname -o || echo "Unknown (maybe MacOS-X)"`
1.53 -CT_SYS_MACHINE=`uname -m`
1.54 -CT_SYS_PROCESSOR=`uname -p`
1.55 -CT_SYS_GCC=`gcc -dumpversion`
1.56 -CT_SYS_TARGET=`CT_DoConfigGuess`
1.57 +CT_SYS_OS=$(uname -o || echo "Unknown (maybe MacOS-X)")
1.58 +CT_SYS_MACHINE=$(uname -m)
1.59 +CT_SYS_PROCESSOR=$(uname -p)
1.60 +CT_SYS_GCC=$(gcc -dumpversion)
1.61 +CT_SYS_TARGET=$(CT_DoConfigGuess)
1.62 CT_TOOLCHAIN_ID="crosstool-${CT_VERSION} build ${CT_STAR_DATE_HUMAN} by ${CT_SYS_USER}@${CT_SYS_HOSTNAME}"
1.63
1.64 CT_DoLog EXTRA "Preparing working directories"
1.65 @@ -315,8 +315,8 @@
1.66 if [ -z "${CT_RESTART}" ]; then
1.67 # Determine build system if not set by the user
1.68 CT_Test "You did not specify the build system. That's OK, I can guess..." -z "${CT_BUILD}"
1.69 - CT_BUILD="${CT_BUILD:-`CT_DoConfigGuess`}"
1.70 - CT_BUILD=`CT_DoConfigSub "${CT_BUILD}"`
1.71 + CT_BUILD="${CT_BUILD:-$(CT_DoConfigGuess)}"
1.72 + CT_BUILD=$(CT_DoConfigSub "${CT_BUILD}")
1.73
1.74 # Arrange paths depending on wether we use sys-root or not.
1.75 if [ "${CT_USE_SYSROOT}" = "y" ]; then
1.76 @@ -352,7 +352,7 @@
1.77 mkdir -p "${CT_SYSROOT_DIR}/usr/lib"
1.78
1.79 # Canadian-cross are really picky on the way they are built. Tweak the values.
1.80 - CT_UNIQ_BUILD=`echo "${CT_BUILD}" |sed -r -e 's/-/-build_/'`
1.81 + CT_UNIQ_BUILD=$(echo "${CT_BUILD}" |sed -r -e 's/-/-build_/')
1.82 if [ "${CT_CANADIAN}" = "y" ]; then
1.83 # Arrange so that gcc never, ever think that build system == host system
1.84 CT_CANADIAN_OPT="--build=${CT_UNIQ_BUILD}"
1.85 @@ -383,7 +383,7 @@
1.86 # (Copied almost as-is from original crosstool):
1.87 case "${CT_KERNEL},${CT_CANADIAN}" in
1.88 cygwin,y) ;;
1.89 - *,y) CT_HOST="`echo \"${CT_HOST}\" |sed -r -e 's/-/-host_/;'`";;
1.90 + *,y) CT_HOST=$(echo "${CT_HOST}" |sed -r -e 's/-/-host_/;');;
1.91 esac
1.92
1.93 # Ah! Recent versions of binutils need some of the build and/or host system
1.94 @@ -392,7 +392,7 @@
1.95 CT_DoLog DEBUG "Making build system tools available"
1.96 mkdir -p "${CT_PREFIX_DIR}/bin"
1.97 for tool in ar as dlltool ${CT_CC_NATIVE:=gcc} gnatbind gnatmake ld nm ranlib strip windres objcopy objdump; do
1.98 - tmp=`CT_Which ${tool}`
1.99 + tmp=$(CT_Which ${tool})
1.100 if [ -n "${tmp}" ]; then
1.101 ln -sfv "${tmp}" "${CT_PREFIX_DIR}/bin/${CT_BUILD}-${tool}"
1.102 ln -sfv "${tmp}" "${CT_PREFIX_DIR}/bin/${CT_UNIQ_BUILD}-${tool}"
1.103 @@ -480,7 +480,7 @@
1.104 else
1.105 CT_DoSaveState ${step}
1.106 if [ ${do_stop} -eq 1 ]; then
1.107 - CT_DoLog ERROR "Stopping just after step \"${prev_step}\", as requested."
1.108 + CT_DoLog ERROR "Stopping just after step '${prev_step}', as requested."
1.109 exit 0
1.110 fi
1.111 fi
1.112 @@ -490,7 +490,7 @@
1.113 do_stop=1
1.114 fi
1.115 if [ "${CTDEBUG_CT_PAUSE_STEPS}" = "y" ]; then
1.116 - CT_DoPause "Step \"${step}\" finished"
1.117 + CT_DoPause "Step '${step}' finished"
1.118 fi
1.119 fi
1.120 prev_step="${step}"
1.121 @@ -513,13 +513,13 @@
1.122 CT_Pushd "${CT_PREFIX_DIR}/bin"
1.123 for t in "${CT_TARGET}-"*; do
1.124 if [ -n "${CT_TARGET_ALIAS}" ]; then
1.125 - _t="`echo \"$t\" |sed -r -e 's/^'\"${CT_TARGET}\"'-/'\"${CT_TARGET_ALIAS}\"'-/;'`"
1.126 - CT_DoLog DEBUG "Linking \"${_t}\" -> \"${t}\""
1.127 + _t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;')
1.128 + CT_DoLog DEBUG "Linking '${_t}' -> '${t}'"
1.129 ln -sv "${t}" "${_t}" 2>&1 |CT_DoLog ALL
1.130 fi
1.131 if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
1.132 - _t="`echo \"$t\" |sed -r -e \"${CT_TARGET_ALIAS_SED_EXPR}\"`"
1.133 - CT_DoLog DEBUG "Linking \"${_t}\" -> \"${t}\""
1.134 + _t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
1.135 + CT_DoLog DEBUG "Linking '${_t}' -> '${t}'"
1.136 ln -sv "${t}" "${_t}" 2>&1 |CT_DoLog ALL
1.137 fi
1.138 done