1.1 --- a/scripts/crosstool.sh Sun Sep 16 08:52:26 2007 +0000
1.2 +++ b/scripts/crosstool.sh Sun Sep 16 17:59:18 2007 +0000
1.3 @@ -82,6 +82,10 @@
1.4 # then rescan the options file now:
1.5 . "${CT_TOP_DIR}/.config"
1.6
1.7 +# Second kludge: merge user-supplied target CFLAGS with architecture-provided
1.8 +# target CFLAGS
1.9 +CT_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_TARGET_CFLAGS}"
1.10 +
1.11 # Now, build up the variables from the user-configured options.
1.12 CT_KERNEL_FILE="${CT_KERNEL}-${CT_KERNEL_VERSION}"
1.13 CT_BINUTILS_FILE="binutils-${CT_BINUTILS_VERSION}"
1.14 @@ -212,7 +216,7 @@
1.15 ;;
1.16 esac
1.17
1.18 -# Setting up the rest of the environment only is not restarting
1.19 +# Setting up the rest of the environment only if not restarting
1.20 if [ -z "${CT_RESTART}" ]; then
1.21 # Determine build system if not set by the user
1.22 CT_Test "You did not specify the build system. That's OK, I can guess..." -z "${CT_BUILD}"