From b3f5a8708079850e989a77b2c0173ccdd7624ca9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Tue, 26 Aug 2008 16:47:47 +0000 Subject: 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(-) --- scripts/build/libc_eglibc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/build/libc_eglibc.sh b/scripts/build/libc_eglibc.sh index 343ba23e..c291148e 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" -- cgit v1.2.3