summaryrefslogtreecommitdiffstats
path: root/libxslt
diff options
context:
space:
mode:
Diffstat (limited to 'libxslt')
-rw-r--r--libxslt/ExternalProject_xslt.mk58
1 files changed, 29 insertions, 29 deletions
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk
index b64eb935c73d..e468267758ae 100644
--- a/libxslt/ExternalProject_xslt.mk
+++ b/libxslt/ExternalProject_xslt.mk
@@ -19,40 +19,40 @@ $(eval $(call gb_ExternalProject_register_targets,xslt,\
ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
$(call gb_ExternalProject_get_state_target,xslt,build):
- cd $(EXTERNAL_WORKDIR) \
- && ./configure --without-crypto --without-python --disable-static \
- $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
- $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
- LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2" \
- OBJDUMP=objdump \
- && chmod 777 xslt-config \
- && $(MAKE) \
- && touch $@
+ $(call gb_ExternalProject_run,build,\
+ ./configure --without-crypto --without-python --disable-static \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
+ LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2" \
+ OBJDUMP=objdump \
+ && chmod 777 xslt-config \
+ && $(MAKE) \
+ )
else # COM=MSC
$(call gb_ExternalProject_get_state_target,xslt,build):
- cd $(EXTERNAL_WORKDIR)/win32 \
- && cscript configure.js \
- && unset MAKEFLAGS \
- && LIB="$(ILIB)" nmake \
- && touch $@
+ $(call gb_ExternalProject_run,build,\
+ cscript configure.js \
+ && unset MAKEFLAGS \
+ && LIB="$(ILIB)" nmake \
+ ,win32)
endif
else # OS!=WNT
$(call gb_ExternalProject_get_state_target,xslt,build):
- cd $(EXTERNAL_WORKDIR) \
- && ./configure --without-crypto --without-python \
- $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
- LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
- $(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
- $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
- $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
- $(if $(filter IOS,$(OS)),LIBS="-liconv") \
- --disable-shared,--disable-static) \
- $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR) LIBXML2LIB=-lxml2) \
- && chmod 777 xslt-config \
- && $(MAKE) \
- && touch $@
+ $(call gb_ExternalProject_run,build,\
+ ./configure --without-crypto --without-python \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+ LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
+ $(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
+ $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
+ $(if $(filter IOS,$(OS)),LIBS="-liconv") \
+ --disable-shared,--disable-static) \
+ $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR) LIBXML2LIB=-lxml2) \
+ && chmod 777 xslt-config \
+ && $(MAKE) \
+ )
endif
# vim: set noet sw=4 ts=4: