summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2016-02-04 00:23:33 +0100
committerLionel Elie Mamane <lionel@mamane.lu>2016-02-04 00:49:44 +0100
commit91a7580e03d5b47c6e2513afce85ddee45e730b6 (patch)
treed639e1dde14bd5325d123dd9e940d891900ba48b
parent0ab1a87f0dc5b65624dfcf19f59542bab7dfb670 (diff)
apparently breaks Win-x86@42 tinderbox... disable on Windows.
Note it works well on the Windows Jenkins build check. Go figure. Change-Id: I05990274d85b1044a94ec7371130bf918f8fd09e
-rw-r--r--external/firebird/ExternalProject_firebird.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 0e8081168997..6aa992fa1357 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -24,11 +24,15 @@ $(eval $(call gb_ExternalProject_register_targets,firebird,\
# note: this can intentionally only build against internal atomic_op
# note: this can intentionally only build against internal tommath
+ifneq ($(OS),WNT)
+SET_FCA=&& FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))'
+endif
+
# do not set LDFLAGS - it is mysteriously not used by firebird on MacOSX
$(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
- && FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))' \
+ $(SET_FCA) \
&& if [ -n "$${FB_CPU_ARG}" ]; then \
FB_PRLL_ARG="CPU=\$$(EMPTY) $${FB_CPU_ARG}"; \
else \