diff options
| author | Brian Harring <ferringb@chromium.org> | 2011-12-23 18:16:15 -0800 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-02-05 06:56:23 -0800 |
| commit | 611881403f048f069b08d96f36dfcf4686bce146 (patch) | |
| tree | 93ffd463e73de29a25125a876fedbca02efd5761 /scripts | |
| parent | b0689c8dec259847087362922d2cf3249fd85c83 (diff) | |
CHROMIUM: make-3.82: hack to fix differing behaviour between 3.81 and 3.82
BUG=chromium-os:19882
TEST=emerge make-3.82 via I7d0a6e25, emerge-x86-alex chromeos-kernel
Change-Id: I6accabc10e93fe12debba42667900e4e0463cb41
Signed-off-by: Brian Harring <ferringb@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/13474
Reviewed-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: http://git-master/r/189630
Tested-by: Andrew Chew <achew@nvidia.com>
Reviewed-by: Allen Martin <amartin@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-on: http://git-master/r/196082
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.fwinst | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst index 6bf8e87f1dcf..689204f2faa9 100644 --- a/scripts/Makefile.fwinst +++ b/scripts/Makefile.fwinst @@ -27,7 +27,7 @@ endif installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw)) installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all)) -installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/. +installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH) # Workaround for make < 3.81, where .SECONDEXPANSION doesn't work. PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs @@ -36,6 +36,14 @@ $(INSTALL_FW_PATH)/$$(%): install-all-dirs install-all-dirs: $(installed-fw-dirs) @true + +# hack for make-3.82 support; without this (admittedly daft) rule, +# firmware installation fails since it can't find a matching +# rule for $(INSTALL_FW_PATH/.. +# leave the hack in place till the root cause is fully found, without +# it make-3.82 cannot be used. +$(INSTALL_FW_PATH)/./: $(INSTALL_FW_PATH) + quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) cmd_install = $(INSTALL) -m0644 $< $@ |