diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-05-10 09:01:29 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-05-10 09:04:24 -0400 |
| commit | 5138f8d3ed0824df1b313d015bbc1979957db8dc (patch) | |
| tree | 28cd5292560c2908403266416f2f23fd392af9bf | |
| parent | Fixes to allow per-project/component platform/config variables (diff) | |
| download | ice-5138f8d3ed0824df1b313d015bbc1979957db8dc.tar.bz2 ice-5138f8d3ed0824df1b313d015bbc1979957db8dc.tar.xz ice-5138f8d3ed0824df1b313d015bbc1979957db8dc.zip | |
New nodeprecatedwarnings-cppflags variable
| -rw-r--r-- | config/Make.rules.Darwin | 2 | ||||
| -rw-r--r-- | config/Make.rules.Linux | 2 | ||||
| -rw-r--r-- | cpp/src/IcePatch2Lib/Makefile.mk | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/config/Make.rules.Darwin b/config/Make.rules.Darwin index 1ae14a64238..e45e00adcab 100644 --- a/config/Make.rules.Darwin +++ b/config/Make.rules.Darwin @@ -46,6 +46,8 @@ else CXXFLAGS += -g endif +nodeprecatedwarnings-cppflags := -Wno-deprecated-declarations + loader_path = @loader_path mklib = $(or $($3_ar),$(AR)) -static -no_warning_for_no_symbols -o $1 $2 diff --git a/config/Make.rules.Linux b/config/Make.rules.Linux index 4a71c9a8c24..ea1dabcded7 100644 --- a/config/Make.rules.Linux +++ b/config/Make.rules.Linux @@ -92,6 +92,8 @@ else CXXFLAGS += -g endif +nodeprecatedwarnings-cppflags := -Wno-deprecated-declarations + loader_path = \$$ORIGIN mklib = $(or $($3_ar),$(AR)) cr $1 $2 diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk index f55856ccd2b..3f2c152a207 100644 --- a/cpp/src/IcePatch2Lib/Makefile.mk +++ b/cpp/src/IcePatch2Lib/Makefile.mk @@ -13,6 +13,6 @@ IcePatch2_targetdir := $(libdir) IcePatch2_dependencies := Ice IcePatch2_libs := bz2 IcePatch2_sliceflags := --include-dir IcePatch2 --dll-export ICE_PATCH2_API -IcePatch2_cppflags := -Wno-deprecated-declarations +IcePatch2_cppflags := $(nodeprecatedwarnings-cppflags) projects += $(project) |