diff options
Diffstat (limited to 'icu/ExternalProject_icu.mk')
| -rw-r--r-- | icu/ExternalProject_icu.mk | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk index b76b333c6aa6..a376b4f51241 100644 --- a/icu/ExternalProject_icu.mk +++ b/icu/ExternalProject_icu.mk @@ -23,27 +23,27 @@ ifeq ($(OS),WNT) ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,icu,build) : - cd $(EXTERNAL_WORKDIR)/source \ - && export LIB="$(ILIB)" \ - && CFLAGS="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" ./runConfigureICU Cygwin/MSVC \ - && $(MAKE) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export LIB="$(ILIB)" \ + && CFLAGS="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" ./runConfigureICU Cygwin/MSVC \ + && $(MAKE) \ + ,source) else $(call gb_ExternalProject_get_state_target,icu,build) : - cd $(EXTERNAL_WORKDIR)/source \ - && CPPFLAGS=$(icu_CPPFLAGS) CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" \ - LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \ - LDFLAGS="-L$(COMPATH)/lib -Wl,--enable-runtime-pseudo-reloc-v2 \ - $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ - ./configure - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ - --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \ - --enable-layout --disable-static --enable-shared --disable-samples \ - && $(MAKE) \ - && for lib in icudata icuin icuuc icule icutu; do \ - @touch $$lib; \ - done \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + CPPFLAGS=$(icu_CPPFLAGS) CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" \ + LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \ + LDFLAGS="-L$(COMPATH)/lib -Wl,--enable-runtime-pseudo-reloc-v2 \ + $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ + ./configure + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \ + --enable-layout --disable-static --enable-shared --disable-samples \ + && $(MAKE) \ + && for lib in icudata icuin icuuc icule icutu; do \ + @touch $$lib; \ + done \ + ,source) endif else # $(OS) @@ -64,21 +64,22 @@ icu_LDFLAGS:="$(if $(filter TRUE,$(HAVE_LD_HASH_STYLE)),-Wl$(COMMA)--hash-style= $(if $(filter ANDROID,$(OS)),-lgnustl_shared -lm)" $(call gb_ExternalProject_get_state_target,icu,build) : - cd $(EXTERNAL_WORKDIR)/source \ - && CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \ - CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \ - ./configure \ - --enable-layout --disable-samples \ - $(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \ - $(if $(filter ANDROID,$(OS)),--disable-strict) \ - $(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--enable-static --disable-shared,\ - --disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\ - --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\ - && $(MAKE) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \ + CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \ + ./configure \ + --enable-layout --disable-samples \ + $(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \ + $(if $(filter ANDROID,$(OS)),--disable-strict) \ + $(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),\ + --enable-static --disable-shared,\ + --disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\ + --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\ + && $(MAKE) \ + ,source) endif |