external/firebird/ExternalProject_firebird.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 1e38737b72ab3c3b550675ece22130c07b14577a
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Sat Jan 30 12:06:09 2016 +0100
fix internal firebird with --no-parallelism
Change-Id: I013864b9dd8baeb572b43ca7794be193a23398a3
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index 353786a..939b29d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_ExternalProject_register_targets,firebird,\
build \
))
+FB_PRLL_ARG:=$(shell if [ "0$(PARALLELISM)" -gt 0 ]; then echo
"CPU=$(PARALLELISM)"; fi)
+
# note: this can intentionally only build against internal atomic_op
# note: this can intentionally only build against internal tommath
@@ -60,7 +62,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& $(if $(filter WNT,$(OS)),\
PATH="$(shell cygpath -u $(call
gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
$(gb_Helper_set_ld_path)) \
- $(MAKE) CPU=$(PARALLELISM) SHELL=$(SHELL) firebird_embedded \
+ $(MAKE) $(FB_PRLL_ARG) SHELL=$(SHELL) firebird_embedded \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl
OOO \
$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.5) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
