[git commit] buildsys: tweak WARNINGS config name

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Mon Jun 18 08:25:16 UTC 2012


commit: http://git.uclibc.org/uClibc++/commit/?id=afec01279178395972e39ae335a7b4cec80d20ac
branch: http://git.uclibc.org/uClibc++/commit/?id=refs/heads/master

uClibc uses WARNINGS too so use UCLIBCXX_WARNINGS here to avoid
redefinition warnings on setups using both libs.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 ChangeLog                    |    1 +
 Rules.mak                    |    2 +-
 extra/Configs/Config.in.arch |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 195caf8..18b866c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 0.2.5
+-   buildsys: rename .config WARNINGS to UCLIBCXX_WARNINGS
 -   unwind: Fix for __ARM_EABI_UNWINDER__
 
 0.2.4
diff --git a/Rules.mak b/Rules.mak
index c3b8319..fba09e0 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -102,7 +102,7 @@ PICFLAG:=-fPIC
 OPTIMIZATION+=$(call check_gcc,-Os,-O2)
 
 # Add a bunch of extra pedantic annoyingly strict checks
-XWARNINGS=$(call qstrip,$(WARNINGS)) -Wno-trigraphs -pedantic
+XWARNINGS=$(call qstrip,$(UCLIBCXX_WARNINGS)) -Wno-trigraphs -pedantic
 CPU_CFLAGS=$(call qstrip,$(CPU_CFLAGS-y))
 
 # Some nice CFLAGS to work with
diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch
index bfbfab2..1cd1318 100644
--- a/extra/Configs/Config.in.arch
+++ b/extra/Configs/Config.in.arch
@@ -35,7 +35,7 @@ config UCLIBCXX_HAS_TLS
 
 	  Answering no will use non thread-safe exception handling.
 
-config WARNINGS
+config UCLIBCXX_WARNINGS
 	string "Compiler Warnings"
 	default "-Wall"
 	help


More information about the uClibc-cvs mailing list