summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-08-26 16:47:47 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-08-26 16:47:47 (GMT)
commitb3f5a8708079850e989a77b2c0173ccdd7624ca9 (patch)
tree2bee87872f3b0499a2621ba96fd05fb138e82c40 /scripts
parent9dd85f517a15f6bb9e575fd614591647747deff4 (diff)
Commonalise options common to both glibc and eglibc.
/trunk/scripts/build/libc_eglibc.sh | 6 3 3 0 +- /trunk/config/libc/glibc.in | 63 2 61 0 +--------------------------------- /trunk/config/libc/eglibc.in | 61 1 60 0 +-------------------------------- /trunk/config/libc/eglibc-glibc-common.in | 1 1 0 0 + /trunk/config/libc/glibc-eglibc-common.in | 69 69 0 0 +++++++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 124 deletions(-)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/libc_eglibc.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/libc_eglibc.sh b/scripts/build/libc_eglibc.sh
index 343ba23..c291148 100644
--- a/scripts/build/libc_eglibc.sh
+++ b/scripts/build/libc_eglibc.sh
@@ -204,7 +204,7 @@ do_libc() {
nptl) extra_config="${extra_config} --with-__thread --with-tls";;
linuxthreads) extra_config="${extra_config} --with-__thread --without-tls --without-nptl";;
none) extra_config="${extra_config} --without-__thread --without-nptl"
- case "${CT_LIBC_EGLIBC_EXTRA_CONFIG}" in
+ case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in
*-tls*) ;;
*) extra_config="${extra_config} --without-tls";;
esac
@@ -236,7 +236,7 @@ do_libc() {
CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'"
BUILD_CC=${CT_CC_NATIVE} \
- CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_EGLIBC_EXTRA_CFLAGS} -O" \
+ CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O" \
CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
AR=${CT_TARGET}-ar \
RANLIB=${CT_TARGET}-ranlib \
@@ -250,7 +250,7 @@ do_libc() {
--without-gd \
--without-cvs \
${extra_config} \
- ${CT_LIBC_EGLIBC_EXTRA_CONFIG}
+ ${CT_LIBC_GLIBC_EXTRA_CONFIG}
CT_DoLog EXTRA "Building C library"