summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-11-16 19:24:03 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-11-16 19:24:03 (GMT)
commitbd8e670d5e06870cb952fa88b3990e47b7747e7a (patch)
treeffdc7468d0921e03e9bef23670d555d0af5dc5b5
parent6c882486475e1253c5143134207edd816f44afbb (diff)
libc/glibc: allow more than one line in configparms
-rw-r--r--config/libc/glibc-eglibc.in-common4
-rw-r--r--scripts/build/libc/glibc.sh6
2 files changed, 5 insertions, 5 deletions
diff --git a/config/libc/glibc-eglibc.in-common b/config/libc/glibc-eglibc.in-common
index 5a066a7..61d6dba 100644
--- a/config/libc/glibc-eglibc.in-common
+++ b/config/libc/glibc-eglibc.in-common
@@ -38,8 +38,8 @@ config LIBC_GLIBC_CONFIGPARMS
Unless you are building a toolchain for sh3/4, you should leave that empty.
- Note: this is awkward, and doesn't work well if you need more than one
- line in configparms
+ Note: If you need to pass more than one value, separate them with
+ '\n'. Eg.: var1=val1\nvar2=val2
config LIBC_GLIBC_EXTRA_CFLAGS
string
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 44633b1..c9a6898 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -141,7 +141,7 @@ do_libc_headers() {
extra_config+=("$(do_libc_min_kernel_config)")
# Pre-seed the configparms file with values from the config option
- echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
+ printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
cross_cc=$(CT_Which "${CT_TARGET}-gcc")
CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'"
@@ -309,7 +309,7 @@ do_libc_start_files() {
CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'"
# Pre-seed the configparms file with values from the config option
- echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
+ printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
echo "libc_cv_forced_unwind=yes" > config.cache
echo "libc_cv_c_cleanup=yes" >> config.cache
@@ -418,7 +418,7 @@ do_libc() {
CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'"
# Pre-seed the configparms file with values from the config option
- echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
+ printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
# For glibc 2.3.4 and later we need to set some autoconf cache
# variables, because nptl/sysdeps/pthread/configure.in does not