diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-28 10:26:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-28 11:22:42 +0000 |
| commit | bc3170b4c15e8287e990fb9ae9c74241345038dc (patch) | |
| tree | e8b4711b5b9cf2d04afa0678a1a05afb70e42938 /icu | |
| parent | 02a985013e816c94a07cf93491873fddfe090b1d (diff) | |
use our default opt/noopt and symbol flags with icu
so --enable-symbols gets -g in here with -O2
for gcc always add -fno-strict-aliasing
Change-Id: I8d673ebaf26d5afdcc5ae5de626cc7f32ffd6835
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/ExternalProject_icu.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk index 71d6cbacd264..610b5102d2c5 100644 --- a/icu/ExternalProject_icu.mk +++ b/icu/ExternalProject_icu.mk @@ -48,15 +48,17 @@ endif else # $(OS) -icu_CFLAGS:="$(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer) \ - $(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ +icu_CFLAGS:="$(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ $(if $(SYSBASE),-I$(SYSBASE)/usr/include) \ - $(if $(debug),-g,\ - $(if $(filter GCC,$(COM)),-O2 -fno-strict-aliasing,-O))" -icu_CXXFLAGS:="$(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer) \ - $(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ - $(if $(debug),-g,\ - $(if $(filter GCC,$(COM)),-O2 -fno-strict-aliasing,-O))" + $(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) \ + $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \ + $(if $(filter $(true),$(gb_SYMBOL)),-g) \ + $(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer)" +icu_CXXFLAGS:="$(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ + $(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) \ + $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \ + $(if $(filter $(true),$(gb_SYMBOL)),-g) \ + $(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer)" icu_LDFLAGS:="$(if $(filter TRUE,$(HAVE_LD_HASH_STYLE)),-Wl$(COMMA)--hash-style=$(WITH_LINKER_HASH_STYLE)) \ $(if $(SYSBASE),-L../lib -L../../lib -L../stubdata -L../../stubdata -L$(SYSBASE)/usr/lib) \ $(if $(filter TRUE,$(HAVE_LD_BSYMBOLIC_FUNCTIONS)),\ |