1043108 - Remove arch:IA32 from non-x86 builds

Status: RESOLVED FIXED

(Firefox Build System :: General, defect, P2)

Description

[(Away)]

(In reply to Vladimir Vukicevic [:vlad] [:vladv] from comment #37)
> -arch:IA32 is not valid when doing x64 builds, but configure will now
> unconditionally add it.  This creates a lot of spam during the build:
> 
> cl : Command line warning D9002 : ignoring unknown option '-arch:IA32'
> 
> We should only add this option when doing 32-bit builds.

Comment 1

[(Away)]

How can I detect architecture in the NSS/NSPR builds? I tried testing CPU_ARCH, but it seems that's not the right thing to use. On my win64 build, CPU_ARCH is x386 in NSS and x86 in NSPR.

Comment 2

[Wan-Teh Chang]

Attachment: NSPR patch

David: after inspecting the NSPR configure.in script, I think this is
the most convenient place to add the -arch:IA32 flag to x86 builds.

An alternative solution is to duplicate the case statement where we
currently add the -arch:IA32 flag:

     case "$target_cpu" in
     i*86)
         if test "$MSC_VER" -ge "1700" -a -z "$USE_64"; then
             dnl Visual C++ 2012 defaults to -arch:SSE2. Use -arch:IA32
             dnl to avoid requiring SSE2.
             CFLAGS="$CFLAGS -arch:IA32"
         fi
         ;;
     esac

Which solution do you prefer?

Comment 3

[Wan-Teh Chang]

Attachment: NSS patch

Comment 4

[Wan-Teh Chang]

Comment on attachment 8467950 [details] [diff] [review]
NSS patch

Patch checked in: https://hg.mozilla.org/projects/nss/rev/dc69e3911326

Comment 5

[(Away)]

Comment on attachment 8467779 [details] [diff] [review]
NSPR patch

Either approach sounds fine, thanks for the patches!

Comment 6

[Wan-Teh Chang]

Comment on attachment 8467779 [details] [diff] [review]
NSPR patch

Patch checked in: https://hg.mozilla.org/projects/nspr/rev/42d9fa709ca2

Comment 7

[(Away)]

Thanks, I'll add the top-level and JS configures when I get a chance.

Comment 8

[Wan-Teh Chang]

Comment on attachment 8467779 [details] [diff] [review]
NSPR patch

Regenerated nspr/configure: https://hg.mozilla.org/projects/nspr/rev/1a9eb31b1e6f

Comment 9

[Wan-Teh Chang]

Comment on attachment 8467779 [details] [diff] [review]
NSPR patch

NSPR patch pushed to mozilla-inbound as part of the NSPR_4_10_7_BETA4 tag:
https://hg.mozilla.org/integration/mozilla-inbound/rev/cc8cee47432c

Comment 10

[Wan-Teh Chang]

Comment on attachment 8467950 [details] [diff] [review]
NSS patch

NSS patch pushed to mozilla-central as part of the NSS_3_17_BETA2 tag:
https://hg.mozilla.org/mozilla-central/rev/07b8619be3bb

Comment 11

[Nigel Babu [:nigelb]]

https://hg.mozilla.org/mozilla-central/rev/cc8cee47432c

Comment 12

[(Away)]

We still need the main and JS configure files.

Comment 13

[(Away)]

Attachment: Top-level and JS configures

Comment 14

[(Away)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/709185909884

Comment 15

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/709185909884