summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2011-10-19 14:41:58 +0200
committerMichael Stahl <mstahl@redhat.com>2011-10-21 20:17:18 +0200
commitccc4b087303fd0fb1446056c41445ab68a415146 (patch)
tree66e2025cc4c47a00f7a6dbc0673d86234243ef1a
parent548fc5db7c39f62d99b1c0a9e4348972ff72545e (diff)
Revert "pass -s flag to custom target's make process"
This reverts commit 6c8a7e0e6ad223051442ef6ce1d1103086c3f4a0. Doing this explicitly is unnecessary because make does it automatically. Also, make will pass --jobserver-fds, which happens to match in findstring as well.
-rw-r--r--solenv/gbuild/CustomTarget.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 20cd29a0055f..0df096aadf76 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -32,7 +32,7 @@ gb_CustomTarget_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
define gb_CustomTarget__command
+$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
- $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< $(if $(findstring s,$(MAKEFLAGS)),-s) && \
+ $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
touch $(1))
endef