summaryrefslogtreecommitdiff
path: root/scripts/crosstool.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/crosstool.sh')
-rwxr-xr-xscripts/crosstool.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh
index 0a357bc..5a12fd1 100755
--- a/scripts/crosstool.sh
+++ b/scripts/crosstool.sh
@@ -82,6 +82,10 @@ CT_DoBuildTargetTuple
# then rescan the options file now:
. "${CT_TOP_DIR}/.config"
+# Second kludge: merge user-supplied target CFLAGS with architecture-provided
+# target CFLAGS
+CT_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_TARGET_CFLAGS}"
+
# Now, build up the variables from the user-configured options.
CT_KERNEL_FILE="${CT_KERNEL}-${CT_KERNEL_VERSION}"
CT_BINUTILS_FILE="binutils-${CT_BINUTILS_VERSION}"
@@ -212,7 +216,7 @@ case "${CT_LOG_TO_FILE}" in
;;
esac
-# Setting up the rest of the environment only is not restarting
+# Setting up the rest of the environment only if not restarting
if [ -z "${CT_RESTART}" ]; then
# Determine build system if not set by the user
CT_Test "You did not specify the build system. That's OK, I can guess..." -z "${CT_BUILD}"