[Libreoffice-commits] core.git: external/lpsolve

Stephan Bergmann sbergman at redhat.com
Tue Aug 12 03:31:06 PDT 2014


 external/lpsolve/ExternalProject_lpsolve.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eda3beff19f95c634fa6f0320e7ab0f942f51f3e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Aug 12 10:18:55 2014 +0200

    Let building lpsolve fail when its ccc script fails
    
    (hopefully, the various ccc script variants do not include code that would
    unintentionally fail the script with -e)
    
    Change-Id: Ia04291983d99a8cf5a74e6a0078e179c17a93f2b

diff --git a/external/lpsolve/ExternalProject_lpsolve.mk b/external/lpsolve/ExternalProject_lpsolve.mk
index e0a9e46..a40ada4 100644
--- a/external/lpsolve/ExternalProject_lpsolve.mk
+++ b/external/lpsolve/ExternalProject_lpsolve.mk
@@ -33,7 +33,7 @@ else # $(OS)!=WNT
 $(call gb_ExternalProject_get_state_target,lpsolve,build):
 	$(call gb_ExternalProject_run,build,\
 		CC="$(CC) $(if $(debug),$(gb_COMPILERNOOPTFLAGS) $(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))" \
-		sh $(if $(filter MACOSX,$(OS)),ccc.osx, \
+		sh -e $(if $(filter MACOSX,$(OS)),ccc.osx, \
 		$(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \
 		$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \
 		ccc))) \


More information about the Libreoffice-commits mailing list