diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-02 22:33:25 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-02 22:33:25 +0200 |
| commit | 0d8c55026535256128d66f6d0d484a5af9c2d464 (patch) | |
| tree | 3f2a1b7878d7e729b131a9d3c781b4e4f9397a54 | |
| parent | 211a54b31ff6f71bf4a1883f4ed81b3fa9f2e135 (diff) | |
(minor) EXTRA_CDEFS are preprocessor plags
| -rw-r--r-- | icu/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 684785500c31..6395e1f7bbe6 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -75,9 +75,9 @@ CC:=gcc $(EXTRA_CFLAGS) .ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(OS)"=="MACOSX" -icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) +icu_CFLAGS+=-O $(ARCH_FLAGS) icu_LDFLAGS+=$(EXTRA_LINKFLAGS) -icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) +icu_CXXFLAGS+=-O $(ARCH_FLAGS) # remove conversion and transliteration data to reduce binary size. CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ; @@ -117,7 +117,7 @@ STATIC_OR_SHARED=--disable-static --enable-shared BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(ICU_NATIVE_BUILD_ROOT) .ENDIF -CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ +CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ ./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT)' CONFIGURE_FLAGS= |