summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-05-24 22:38:07 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-05-24 22:38:07 (GMT)
commit8dd0e17c51b33cd3289155a61565c0af37131ff3 (patch)
tree0af1808a6f3ee9464f823aedcc8e2e1e63967eeb
parent9e5b090cc52e598199f636595779f37b00c15472 (diff)
Use the arch-specific target LDFLAGS into the final target LDFLAGS.
Fix a help entry in the CFLAGS_for_target config entry. /trunk/scripts/crosstool.sh | 4 3 1 0 +++- /trunk/config/target.in | 2 1 1 0 +- 2 files changed, 4 insertions(+), 2 deletions(-)
-rw-r--r--config/target.in2
-rwxr-xr-xscripts/crosstool.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/config/target.in b/config/target.in
index f210e0e..26d59d4 100644
--- a/config/target.in
+++ b/config/target.in
@@ -244,7 +244,7 @@ config TARGET_CFLAGS
Used to add specific options when compiling libraries of the toolchain,
that will run on the target (eg. libc.so).
- Note that the options above for CPU, tune, arch and FPU will be
+ Note that the options above for ARCH, ABI, CPU, TUNE and FPU will be
automaticaly used. You don't need to specify them here.
Leave blank if you don't know better.
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh
index 5f5b497..91cdadb 100755
--- a/scripts/crosstool.sh
+++ b/scripts/crosstool.sh
@@ -72,8 +72,10 @@ CT_DoBuildTargetTuple
. "${CT_TOP_DIR}/.config"
# Second kludge: merge user-supplied target CFLAGS with architecture-provided
-# target CFLAGS
+# target CFLAGS. Do the same for LDFLAGS in case it happens in the future.
+# Put user-supplied flags at the end, so that they take precedence.
CT_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_TARGET_CFLAGS}"
+CT_TARGET_LDFLAGS="${CT_ARCH_TARGET_LDFLAGS} ${CT_TARGET_LDFLAGS}"
# Now, build up the variables from the user-configured options.
CT_KERNEL_FILE="${CT_KERNEL}-${CT_KERNEL_VERSION}"