From: Thomas Petazzoni Date: Sun, 4 Dec 2016 21:37:24 +0000 (+0100) Subject: Makefile: move SED definition into the main Makefile X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=90605b8fe72e61ad8224b7f5c2dde7a5dedbf791;p=buildroot.git Makefile: move SED definition into the main Makefile Since commit f71a621d91ec27f175fc84012962f88b1107305f, we are using the SED variable in the main Makefile. However, this variable is only defined in package/Makefile.in, which gets included only when a configuration is defined. This means that, if you do: $ make menuconfig savedefconfig without a configuration defined, it fails with: /bin/bash: /BR2_DEFCONFIG=/d: No such file or directory Makefile:898: recipe for target 'savedefconfig' failed make[1]: *** [savedefconfig] Error 127 This issue affects users of the "buildroot-submodule" project, which does menuconfig+savedefconfig automatically. They worked around this issue in commit https://github.com/Openwide-Ingenierie/buildroot-submodule/commit/d12676b608a58529c6b551aa176464166a200428, but really "make menuconfig savedefconfig" should work out of the box. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- diff --git a/Makefile b/Makefile index 00bcd0f49f..b80b9e1dcb 100644 --- a/Makefile +++ b/Makefile @@ -322,6 +322,7 @@ HOSTLN := $(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln) HOSTNM := $(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm) HOSTOBJCOPY := $(shell which $(HOSTOBJCOPY) || type -p $(HOSTOBJCOPY) || echo objcopy) HOSTRANLIB := $(shell which $(HOSTRANLIB) || type -p $(HOSTRANLIB) || echo ranlib) +SED := $(shell which sed || type -p sed) -i -e export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTLD export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE diff --git a/package/Makefile.in b/package/Makefile.in index 4b3368f49b..688d5b1610 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -213,7 +213,6 @@ endif INSTALL := $(shell which install || type -p install) FLEX := $(shell which flex || type -p flex) BISON := $(shell which bison || type -p bison) -SED := $(shell which sed || type -p sed) -i -e UNZIP := $(shell which unzip || type -p unzip) -q APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(QUIET),-s)