Merge lp:~trond-norbye/pandora-build/32-bit-build into lp:pandora-build

Proposed by Trond Norbye
Status: Merged
Merged at revision: 270
Proposed branch: lp:~trond-norbye/pandora-build/32-bit-build
Merge into: lp:pandora-build
Diff against target: 24 lines (+3/-3)
1 file modified
m4/pandora_64bit.m4 (+3/-3)
To merge this branch: bzr merge lp:~trond-norbye/pandora-build/32-bit-build
Reviewer Review Type Date Requested Status
Monty Taylor Pending
Review via email: mp+50731@code.launchpad.net

Description of the change

Compilation failed on my old p4 box due to the fact that it tried to add -m64 unless I explicitly specified --disable-64bit... This patch "hardcodes" --disable-64bit on 32 bit platforms...

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'm4/pandora_64bit.m4'
2--- m4/pandora_64bit.m4 2010-12-23 18:32:12 +0000
3+++ m4/pandora_64bit.m4 2011-02-22 12:30:31 +0000
4@@ -20,9 +20,9 @@
5 [isainfo_b=`${ISAINFO} -b`],
6 [isainfo_b="x"])
7
8- AS_IF([test "$isainfo_b" != "x"],[
9+ AS_IF([test "$isainfo_b" != "x" -a "$isainfo_b" != "32"],[
10
11- isainfo_k=`${ISAINFO} -k`
12+ isainfo_k=`${ISAINFO} -k`
13 DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_b}"
14
15 AS_IF([test "x$ac_enable_64bit" = "xyes"],[
16@@ -32,7 +32,7 @@
17 ])
18
19 AS_IF([test "x$libdir" = "x\${exec_prefix}/lib"],[
20- dnl The user hasn't overridden the default libdir, so we'll
21+ dnl The user hasn't overridden the default libdir, so we'll
22 dnl the dir suffix to match solaris 32/64-bit policy
23 libdir="${libdir}/${isainfo_k}"
24 ])

Subscribers

People subscribed via source and target branches

to all changes: