scripts/mod/modpost: Fix cross-build race

Define CONFIG_MODPOST_ELFCONFIG macro to specify cross-build elfconfig.h instead of copying header during build. Signed-off-by: Haris Okanovic <[email protected]> Acked-by: Julia Cartwright <[email protected]> Natinst-ReviewBoard-ID: 292369
ni · May 22, 2019 · 638a209 · 638a209
1 parent c9ffae3
commit 638a209
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile
@@ -36,8 +36,7 @@ KBUILD_OUTPUT=$(CURDIR)
 endif
 
 $(patsubst %,$(obj)/$(TGTPRE)%,$(modpost-objs)): $(KBUILD_SRC)/$(src)/$(TGTPRE)elfconfig.h | $(obj)/modpost
- $(Q)cp -f $(KBUILD_SRC)/$(src)/$(TGTPRE)elfconfig.h $(KBUILD_OUTPUT)/$(obj)/elfconfig.h
- $(Q)$(CC) $(TGT_EXTRACFLAGS) $(CFLAGS) -I$(KBUILD_OUTPUT)/$(obj) -c -o $@ $(KBUILD_SRC)/$(subst $(TGTPRE),,$(subst .o,.c,$@))
+ $(Q)$(CC) $(TGT_EXTRACFLAGS) $(CFLAGS) -I$(KBUILD_OUTPUT)/$(obj) -DCONFIG_MODPOST_ELFCONFIG="\"$(TGTPRE)elfconfig.h\"" -c -o $@ $(KBUILD_SRC)/$(subst $(TGTPRE),,$(subst .o,.c,$@))
 
 $(obj)/$(tgtmodpost) : $(patsubst %,$(obj)/$(TGTPRE)%,$(modpost-objs))
  $(Q)$(CC) $(TGT_EXTRACFLAGS) $(CFLAGS) -o $@ $^

diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
@@ -10,7 +10,11 @@
 #include <unistd.h>
 #include <elf.h>
 
+#if defined(CONFIG_MODPOST_ELFCONFIG)
+#include CONFIG_MODPOST_ELFCONFIG
+#else
 #include "elfconfig.h"
+#endif
 
 /* On BSD-alike OSes elf.h defines these according to host's word size */
 #undef ELF_ST_BIND