diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2016-08-17 16:54:03 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2016-08-17 16:54:41 +0200 |
| commit | ebe4259437254123697d6d62a4475f112efff31c (patch) | |
| tree | 907e8eeb762070ba20bcab5736804ba2dfb6c434 /external | |
| parent | be9cb972503d1eb6283d43a8bbabfef7f5ffef0a (diff) | |
fixup firebird with internal icu
Change-Id: I38e44875234aa0c8382ab6e01b4f4c5cc16b834e
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 82de2d3443a9..670041b04294 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -49,26 +49,24 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -I$(call gb_UnpackedTarball_get_dir,libtommath) \ -L$(call gb_UnpackedTarball_get_dir,libtommath) \ ) \ - $(if $(filter WNT MACOSX,$(OS)), \ - $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ - -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ - )) \ + $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ + ) \ " \ && export CXXFLAGS=" \ $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \ $(BOOST_CPPFLAGS) \ -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ ) \ - $(if $(filter-out WNT MACOSX,$(OS)), \ - $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ - -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ - )) \ + $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ + ) \ $(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \ -L$(call gb_UnpackedTarball_get_dir,libtommath) \ ) \ |