summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-05-23 14:19:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-25 07:50:17 +0100
commit8a97d9ef923355956ec08be0aff9428a1573884d (patch)
tree2d037c199c7f5325b4f5229cd50e34f4bc326cae /meta/recipes-devtools
parent06563e639fe089f5e836132fb1aa699a1ba156aa (diff)
downloadpoky-8a97d9ef923355956ec08be0aff9428a1573884d.tar.gz
mkelfimage: fix compile issues
This fixes a couple issues introduced by the previous patch. There were a couple spots where HOST_CFLAGS needed changing to CFLAGS. This fixes builds with security_flags. (From OE-Core rev: 72792a2fd900fe86d18bd8e330bc0535e2eeb80d) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch4
-rw-r--r--meta/recipes-devtools/mkelfimage/mkelfimage_git.bb7
2 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch b/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch
index 2ae9fb50aa..a162eb7d15 100644
--- a/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch
+++ b/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch
@@ -67,7 +67,7 @@ index 51531d6..7e8aa3c 100644
67 $(LI386_OBJ)/mkelf-linux-i386.o: $(LI386_DIR)/mkelf-linux-i386.c $(LI386_DIR)/convert.bin.c $(LI386_DEP) 67 $(LI386_OBJ)/mkelf-linux-i386.o: $(LI386_DIR)/mkelf-linux-i386.c $(LI386_DIR)/convert.bin.c $(LI386_DEP)
68 $(MKDIR) -p $(@D) 68 $(MKDIR) -p $(@D)
69- $(HOST_CC) $(HOST_CFLAGS) -c -g $< -o $@ 69- $(HOST_CC) $(HOST_CFLAGS) -c -g $< -o $@
70+ $(CC) $(HOST_CFLAGS) -c -g $< -o $@ 70+ $(CC) $(CFLAGS) -c -g $< -o $@
71 71
72 72
73 ifdef I386_CC 73 ifdef I386_CC
@@ -80,7 +80,7 @@ index 38f5d8c..5df8870 100644
80 $(LIA64_OBJ)/mkelf-linux-ia64.o: $(LIA64_DIR)/mkelf-linux-ia64.c $(LIA64_DIR)/convert.bin.c $(LIA64_DEP) 80 $(LIA64_OBJ)/mkelf-linux-ia64.o: $(LIA64_DIR)/mkelf-linux-ia64.c $(LIA64_DIR)/convert.bin.c $(LIA64_DEP)
81 $(MKDIR) -p $(@D) 81 $(MKDIR) -p $(@D)
82- $(HOST_CC) $(HOST_CFLAGS) -c -g $< -o $@ 82- $(HOST_CC) $(HOST_CFLAGS) -c -g $< -o $@
83+ $(CC) $(HOST_CFLAGS) -c -g $< -o $@ 83+ $(CC) $(CFLAGS) -c -g $< -o $@
84 84
85 ifdef IA64_CC 85 ifdef IA64_CC
86 86
diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
index d7a4429fb8..2bcc8d7bd9 100644
--- a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
+++ b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
@@ -24,8 +24,11 @@ CLEANBROKEN = "1"
24S = "${WORKDIR}/git/util/mkelfImage" 24S = "${WORKDIR}/git/util/mkelfImage"
25 25
26CFLAGS += "-fno-stack-protector" 26CFLAGS += "-fno-stack-protector"
27CACHED_CONFIGUREVARS += "HOST_CC='${BUILD_CC}'" 27CACHED_CONFIGUREVARS += "\
28EXTRA_OEMAKE += "HOST_CPPFLAGS='${BUILD_CPPFLAGS}'" 28 HOST_CC='${BUILD_CC}' \
29 HOST_CFLAGS='${BUILD_CFLAGS}' \
30 HOST_CPPFLAGS='${BUILD_CPPFLAGS}' \
31"
29 32
30inherit autotools-brokensep 33inherit autotools-brokensep
31 34