diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:52:04 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:52:04 +0100 |
| commit | 0257dbcd07db15a0aeb81d204bb2b22b2819ecb1 (patch) | |
| tree | 5475084f2489397f1077a2ade6c3a0eb97048e6e /icu/makefile.mk | |
| parent | a12885cdad54a4336223e06be45912526f3c4933 (diff) | |
| parent | 32df31d5313d4b95316feaaf127e4f4a596746a3 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
dictionaries/de_AT/README_extension_owner.txt
dictionaries/de_AT/makefile.mk
dictionaries/de_CH/README_extension_owner.txt
dictionaries/de_CH/makefile.mk
dictionaries/de_DE/README_extension_owner.txt
Diffstat (limited to 'icu/makefile.mk')
| -rw-r--r-- | icu/makefile.mk | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index a7c41a92d32f..32b57191fff0 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -74,11 +74,6 @@ CC:=gcc $(EXTRA_CFLAGS) .ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(OS)"=="MACOSX" -# Disable executable stack -.IF "$(OS)$(COM)"=="LINUXGCC" -icu_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) icu_LDFLAGS+=$(EXTRA_LINKFLAGS) icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) @@ -120,7 +115,7 @@ CONFIGURE_FLAGS= # note the position of the single quotes. BUILD_DIR=$(CONFIGURE_DIR) -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) +BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -j$(EXTMAXPROCESS) OUT2LIB= \ $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \ $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) \ @@ -156,9 +151,9 @@ icu_LDFLAGS+=-shared-libgcc icu_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api .ENDIF icu_LDFLAGS+=-L$(COMPATH)$/lib -icu_LIBS=-lmingwthrd +icu_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -icu_LIBS+=-lstdc++_s +icu_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2 CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ @@ -268,6 +263,30 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary .ENDIF +.IF "$(GUI)$(COM)"=="WNTGCC" +ALLTAR : \ + $(LB)$/icudata.lib \ + $(LB)$/icuin$(ICU_BUILD_LIBPOST).lib \ + $(LB)$/icuuc$(ICU_BUILD_LIBPOST).lib \ + $(LB)$/icule$(ICU_BUILD_LIBPOST).lib \ + $(LB)$/icutu$(ICU_BUILD_LIBPOST).lib + +$(LB)$/icudata.lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $@ + +$(LB)$/icuin$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $@ + +$(LB)$/icuuc$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $@ + +$(LB)$/icule$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $@ + +$(LB)$/icutu$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $@ +.ENDIF + # Since you never know what will be in a patch (for example, it may already # patch at configure level) or in the case of a binary patch, we remove the # entire package directory if a patch is newer. |