diff options
Diffstat (limited to 'lpsolve/ExternalProject_lpsolve.mk')
| -rw-r--r-- | lpsolve/ExternalProject_lpsolve.mk | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk index 1644b0f26930..7de29e53b38a 100644 --- a/lpsolve/ExternalProject_lpsolve.mk +++ b/lpsolve/ExternalProject_lpsolve.mk @@ -18,25 +18,25 @@ $(eval $(call gb_ExternalProject_register_targets,lpsolve,\ ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(call gb_ExternalProject_get_state_target,lpsolve,build): - cd $(EXTERNAL_WORKDIR)/lpsolve55 \ - && $(if $(filter WNT,$(OS_FOR_BUILD)), \ - $(if $(filter YES,$(MINGW_SHARED_GCCLIB)) lpsolve_LDFLAGS="-shared-libgcc") \ - $(if $(filter YES,$(MINGW_SHARED_GXXLIB)) lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \ - cmd /c cgcc.bat, sh ccc) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + $(if $(filter WNT,$(OS_FOR_BUILD)), \ + $(if $(filter YES,$(MINGW_SHARED_GCCLIB)) lpsolve_LDFLAGS="-shared-libgcc") \ + $(if $(filter YES,$(MINGW_SHARED_GXXLIB)) lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \ + cmd /c cgcc.bat, sh ccc) \ + ,lpsolve55) else # $(COM)!=GCC $(call gb_ExternalProject_get_state_target,lpsolve,build): - cd $(EXTERNAL_WORKDIR)/lpsolve55 \ - && LIB="$(ILIB)" cmd /c cvc6.bat \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + LIB="$(ILIB)" cmd /c cvc6.bat \ + ,lpsolve55) endif # $(COM) else # $(OS)!=WNT $(call gb_ExternalProject_get_state_target,lpsolve,build): - cd $(EXTERNAL_WORKDIR)/lpsolve55 \ - && sh $(if $(filter MACOSX,$(OS)),ccc.osx, \ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \ - $(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \ - ccc))) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + sh $(if $(filter MACOSX,$(OS)),ccc.osx, \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \ + $(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \ + ccc))) \ + ,lpsolve55) endif # $(OS) # vim: set noet sw=4 ts=4: |