diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-24 15:52:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-24 17:37:44 +0200 |
| commit | 45a420b2f5ea1765ca3da3f31a4b357e292e0423 (patch) | |
| tree | 5604ebf2d56adaa603621b45b0a0ea96b55be9de /solenv | |
| parent | 83709cc62e3bc9ee930b5a59e994a0001bd8c221 (diff) | |
gbuild: do not use ' quotes when echoing dependencies
In AllLangResTarget the gb_Helper_abbreviate_dirs replaces the paths in
the echo command with $W, which the shell then does not expand due to '
quotes. Mixing gb_Helper_abbreviate_dirs and ' is unsafe.
Change-Id: Ia99d185917a55486d5fd67f82d5b323a05e3f5bd
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 2 | ||||
| -rwxr-xr-x | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/PrecompiledHeaders.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 9638d2432301..29f6bc03b5d6 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -112,7 +112,7 @@ ifeq ($(gb_FULLDEPS),$(true)) $(call gb_SrsPartTarget_get_dep_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ - echo '$(call gb_SrsPartTarget_get_target,$*) : $(gb_Helper_PHONY)' > $@) + echo "$(call gb_SrsPartTarget_get_target,$*) : $(gb_Helper_PHONY)" > $@) endif diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 60747e283aa2..915144445fcb 100755 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -114,7 +114,7 @@ endef ifeq ($(gb_FULLDEPS),$(true)) define gb_Object__command_dep mkdir -p $(dir $(1)) && \ - echo '$(2) : $$(gb_Helper_PHONY)' > $(1) + echo "$(2) : $$(gb_Helper_PHONY)" > $(1) endef else diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk index 56acfd0ced4a..8aefc1b3cf5b 100644 --- a/solenv/gbuild/PrecompiledHeaders.mk +++ b/solenv/gbuild/PrecompiledHeaders.mk @@ -43,12 +43,12 @@ endif $(call gb_PrecompiledHeader_get_dep_target,%) : $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ - echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@) + echo "$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)" > $@) $(call gb_NoexPrecompiledHeader_get_dep_target,%) : $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ - echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@) + echo "$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)" > $@) $(call gb_PrecompiledHeader_get_target,%) : $(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE)) |