[Libreoffice-commits] core.git: solenv/gbuild

Stephan Bergmann sbergman at redhat.com
Tue Nov 14 11:01:38 UTC 2017


 solenv/gbuild/Package.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36e0acffbe2759dd2a910d2393f266c5c4898786
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 14 11:59:54 2017 +0100

    Another workaround for "xargs: environment is too large for exec" errors
    
    ...on Windows, similar to df9edbcd2883cec2d0596133131cfbc220dee91f "Work around
    'xargs: environment is too large for exec' errors on Windows"
    
    Change-Id: Ibc23960bbe2b8001eb7e08ed4cff12e4726df01b

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 1ab45b687800..841e819c7c78 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -65,7 +65,7 @@ $(dir $(call gb_Package_get_target,%))%/.dir :
 $(call gb_Package_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),PKG,2)
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
-	&& cat $${RESPONSEFILE} | xargs $(if $(filter MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -f \
+	&& cat $${RESPONSEFILE} | $(if $(filter WNT,$(OS)),env -i PATH="$$PATH") xargs $(if $(filter MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -f \
 	&& rm -f $${RESPONSEFILE}
 
 $(call gb_Package_get_preparation_target,%) :


More information about the Libreoffice-commits mailing list