diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-21 21:34:46 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-19 21:06:53 +0200 |
| commit | 69a98d23e4a55a88bc15225dbac778e42e7b0021 (patch) | |
| tree | 32cedf96dd876abdddb0604dcd710a0ed9c2b0d2 /solenv/gbuild/InstallScript.mk | |
| parent | 2855009f8fd1670c804996d64336ce5c3f45b175 (diff) | |
gbuild: avoid unnecessary Packages while processing scp2 files
This is first in do-not-duplicate-stuff-in-solver patch series.
Adds direct include path for gb_ScpPreprocessTarget.
Avoids copying .par files by using gb_InstallScriptTarget__get_dirs
for include paths.
Change-Id: I0a2b76accbbe7f33c83816fb8ad69cc29590e9e2
Diffstat (limited to 'solenv/gbuild/InstallScript.mk')
| -rw-r--r-- | solenv/gbuild/InstallScript.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk index 35ea142ca147..c325d4bfa2be 100644 --- a/solenv/gbuild/InstallScript.mk +++ b/solenv/gbuild/InstallScript.mk @@ -36,6 +36,10 @@ define gb_InstallScriptTarget__get_files $(notdir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module))))) endef +define gb_InstallScriptTarget__get_dirs +$(sort $(dir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module)))))) +endef + # Pass first arg if make is running in silent mode, second arg otherwise define gb_InstallScriptTarget__if_silent $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2)) @@ -50,7 +54,7 @@ $(call gb_Helper_abbreviate_dirs,\ ) && \ $(gb_InstallScriptTarget_COMMAND) \ $(call gb_InstallScriptTarget__if_silent,-q) \ - -i $(OUTDIR)/par/osl \ + -i $(call gb_InstallScriptTarget__get_dirs,$(SCP_MODULES)) \ -o $(1) \ @@$${RESPONSEFILE} && \ rm -f $${RESPONSEFILE} \ |