summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nspr/files/fix-build-on-x86_64.patch
blob: a6fa1ea607e5e6e0b4ac285a83599058397647cf (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
Fix build failure on x86_64

When the target_cpu is x86_64, we should assume that the pkg uses 64bit,
only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a
opposite logic before.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

Upstream-Status: Pending
---
 configure.in |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 39c96a3..99a03ac 100644
--- a/configure.in
+++ b/configure.in
@@ -1778,24 +1778,24 @@ tools are selected during the Xcode/Developer Tools installation.])
         PR_MD_ASFILES=os_Linux_ia64.s
         ;;
     x86_64)
-        if test -n "$USE_64"; then
-            PR_MD_ASFILES=os_Linux_x86_64.s
-        else
+        if test -n "$USE_N32"; then
             AC_DEFINE(i386)
             PR_MD_ASFILES=os_Linux_x86.s
             CC="$CC -m32"
             CXX="$CXX -m32"
+        else
+            PR_MD_ASFILES=os_Linux_x86_64.s
         fi
         ;;
     ppc|powerpc)
         PR_MD_ASFILES=os_Linux_ppc.s
         ;;
     powerpc64)
-        if test -n "$USE_64"; then
+        if test -n "$USE_N32"; then
+            PR_MD_ASFILES=os_Linux_ppc.s
+        else
             CC="$CC -m64"
             CXX="$CXX -m64"
-        else
-            PR_MD_ASFILES=os_Linux_ppc.s
         fi
         ;;
     m68k)
-- 
1.7.1