summaryrefslogtreecommitdiff
path: root/libc/config.make.in
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-10-25 00:37:10 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-10-25 00:37:10 +0000
commit4bbe4e2185c5484328182720ff7b3bb4f9593bff (patch)
treecd67e40a74928c0f58d4f5b79d2e260e4099fee7 /libc/config.make.in
parent91b4be71461f78cabe1fb5f164cea71b60e9e98a (diff)
Merge changes between r15223 and r15532 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@15545 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/config.make.in')
-rw-r--r--libc/config.make.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/libc/config.make.in b/libc/config.make.in
index 4d1c7ebf4..2b7ae58c6 100644
--- a/libc/config.make.in
+++ b/libc/config.make.in
@@ -53,7 +53,6 @@ have-as-needed = @libc_cv_as_needed@
libgcc_s_suffix = @libc_cv_libgcc_s_suffix@
need-nopic-initfini = @nopic_initfini@
with-fp = @with_fp@
-with-cvs = @with_cvs@
old-glibc-headers = @old_glibc_headers@
unwind-find-fde = @libc_cv_gcc_unwind_find_fde@
have-cpp-asm-debuginfo = @libc_cv_cpp_asm_debuginfo@
@@ -76,7 +75,6 @@ static-libgcc = @libc_cv_gcc_static_libgcc@
versioning = @VERSIONING@
oldest-abi = @oldest_abi@
-no-whole-archive = @no_whole_archive@
exceptions = @exceptions@
multi-arch = @multi_arch@
@@ -108,6 +106,7 @@ CC = @CC@
CXX = @CXX@
BUILD_CC = @BUILD_CC@
CFLAGS = @CFLAGS@
+CPPFLAGS-config = @CPPFLAGS@
ASFLAGS-config = @ASFLAGS_config@
AR = @AR@
NM = @NM@