summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-07-12 23:38:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:47 +0100
commit17dcf19d867eb15d5eadedfda99b18b3b0c379bb (patch)
tree755c7f514fe6d55d0c983399783949d4e26c45ba /meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
parent317447f1d1d18b0e7e5ca837270f9ebf476fdcac (diff)
downloadpoky-17dcf19d867eb15d5eadedfda99b18b3b0c379bb.tar.gz
nss: Fix build with clang
Add a patch to disable a clang specific warning and avoid passing clang options to gcc when we have cross compiler is clang but host compiler is gcc We do not need to use target cflags when building native pieces and hence avoid the inter-mixing of compiler options (From OE-Core rev: d13640f39f8f467597daa42774102329e82d9b68) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch')
-rw-r--r--meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
index 866de07ea8..181c69adb0 100644
--- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
+++ b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
@@ -16,11 +16,11 @@ Upstream-Status: Pending
16 16
17Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> 17Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
18=================================================== 18===================================================
19diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile 19Index: nss-3.24/nss/coreconf/nsinstall/Makefile
20index 1850bcb..5aee84f 100644 20===================================================================
21--- a/nss/coreconf/nsinstall/Makefile 21--- nss-3.24.orig/nss/coreconf/nsinstall/Makefile
22+++ b/nss/coreconf/nsinstall/Makefile 22+++ nss-3.24/nss/coreconf/nsinstall/Makefile
23@@ -18,6 +18,12 @@ INTERNAL_TOOLS = 1 23@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1
24 24
25 include $(DEPTH)/coreconf/config.mk 25 include $(DEPTH)/coreconf/config.mk
26 26
@@ -29,6 +29,7 @@ index 1850bcb..5aee84f 100644
29+# to clean the '-m64' from ARCHFLAG and LDFLAGS. 29+# to clean the '-m64' from ARCHFLAG and LDFLAGS.
30+ARCHFLAG = 30+ARCHFLAG =
31+LDFLAGS = 31+LDFLAGS =
32+CFLAGS =
32+ 33+
33 ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) 34 ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
34 PROGRAM = 35 PROGRAM =