diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2015-04-08 10:04:45 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-15 18:12:43 +0100 |
commit | c53661af384b215ce121427a4b73508b4d28ed25 (patch) | |
tree | c1a4ce618af95d9d1881269944b49d126eaf6768 /meta | |
parent | 2bb285d6b8747fb0daf1bee6d5aaad95d8b45a7c (diff) | |
download | poky-c53661af384b215ce121427a4b73508b4d28ed25.tar.gz |
nss: Fix build in x32 ABI
When try to build nss with x32 ABI enabled fails because
it need to be specified USE_X32 env var.
[YOCTO #7420]
(From OE-Core master rev: 2898c2cf94bd690ebfc4ab5f4d220e6ea05aca82)
(From OE-Core rev: 9eb690e7ce168bcf97055ba0e5325bd0b0107cb4)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/nss/nss.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc index 4082930ace..665e4e6a09 100644 --- a/meta/recipes-support/nss/nss.inc +++ b/meta/recipes-support/nss/nss.inc | |||
@@ -72,6 +72,8 @@ do_compile() { | |||
72 | 72 | ||
73 | if [ "${SITEINFO_BITS}" = "64" ]; then | 73 | if [ "${SITEINFO_BITS}" = "64" ]; then |
74 | export USE_64=1 | 74 | export USE_64=1 |
75 | elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then | ||
76 | export USE_X32=1 | ||
75 | fi | 77 | fi |
76 | 78 | ||
77 | # We can modify CC in the environment, but if we set it via an | 79 | # We can modify CC in the environment, but if we set it via an |
@@ -115,6 +117,8 @@ do_install() { | |||
115 | fi | 117 | fi |
116 | if [ "${SITEINFO_BITS}" = "64" ]; then | 118 | if [ "${SITEINFO_BITS}" = "64" ]; then |
117 | export USE_64=1 | 119 | export USE_64=1 |
120 | elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then | ||
121 | export USE_X32=1 | ||
118 | fi | 122 | fi |
119 | 123 | ||
120 | make -C ./nss \ | 124 | make -C ./nss \ |