diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2022-04-21 13:37:10 +0200 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2022-04-21 13:37:10 +0200 |
commit | 831c754c91f798c53a133bc2cb84eaf38ed32352 (patch) | |
tree | 9c836e007432665e3b9edb2c4fe70a4f0c35aae7 | |
parent | c93eb1a95b1f06c145d4169a8776a318a2085e8b (diff) | |
download | busybox-w32-831c754c91f798c53a133bc2cb84eaf38ed32352.tar.gz busybox-w32-831c754c91f798c53a133bc2cb84eaf38ed32352.tar.bz2 busybox-w32-831c754c91f798c53a133bc2cb84eaf38ed32352.zip |
kbuild: fix building sha256
Pass down the correct EXTRA_CFLAGS to the compiler driver when building
assembler source.
Otherwise building busybox for a multilib other than the default failed
to link since hash_md5_sha256_x86-64_shaNI.o and
hash_md5_sha_x86-64_shaNI.o were built for the default arch which might
not what we requested in the EXTRA_CFLAGS.
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | scripts/Makefile.lib | 1 |
2 files changed, 1 insertions, 8 deletions
@@ -1301,14 +1301,6 @@ quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN $(wildcard $(rm-dirs))) | |||
1301 | quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files))) | 1301 | quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files))) |
1302 | cmd_rmfiles = rm -f $(rm-files) | 1302 | cmd_rmfiles = rm -f $(rm-files) |
1303 | 1303 | ||
1304 | |||
1305 | a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(AFLAGS_KERNEL) \ | ||
1306 | $(NOSTDINC_FLAGS) $(CPPFLAGS) \ | ||
1307 | $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o) | ||
1308 | |||
1309 | quiet_cmd_as_o_S = AS $@ | ||
1310 | cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< | ||
1311 | |||
1312 | # read all saved command lines | 1304 | # read all saved command lines |
1313 | 1305 | ||
1314 | targets := $(wildcard $(sort $(targets))) | 1306 | targets := $(wildcard $(sort $(targets))) |
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index d8d768a28..ac1ac9735 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
@@ -113,6 +113,7 @@ c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \ | |||
113 | $(basename_flags) $(modname_flags) | 113 | $(basename_flags) $(modname_flags) |
114 | 114 | ||
115 | a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \ | 115 | a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \ |
116 | $(__c_flags) \ | ||
116 | $(__a_flags) $(modkern_aflags) | 117 | $(__a_flags) $(modkern_aflags) |
117 | 118 | ||
118 | cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(__cpp_flags) | 119 | cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(__cpp_flags) |