backout c89356582dc9
authorKai Engert <kaie@kuix.de>
Wed, 04 May 2011 13:05:57 +0200
changeset 69303 0e25d6182131f6318a5c5a9d82a718c22a23783c
parent 69302 f44e47cb3d7e1b980b655f509f5cf0312bae2c03
child 69304 85da10660bc50ad054f9c4ec33f8f67f69402a1c
push id11
push userffxbld
push dateThu, 11 Aug 2011 21:43:38 +0000
treeherdermozilla-release@cf0a29826586 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone6.0a1
backs outc89356582dc948908b31cdfcdd22371fd0ba8b3f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
backout c89356582dc9
nsprpub/configure
nsprpub/configure.in
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3536,20 +3536,22 @@ EOF
     CFLAGS="$CFLAGS -Wall -fno-common"
     case "${target_cpu}" in
         i*86*)
             if test -n "$USE_64"; then
                 CPU_ARCH=x86_64
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
+                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
+            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
     DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
     _OPTIMIZE_FLAGS=-O2
     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
     STRIP="$STRIP -x -S"
     DLL_SUFFIX=dylib
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1139,20 +1139,22 @@ case "$target" in
     CFLAGS="$CFLAGS -Wall -fno-common"
     case "${target_cpu}" in
         i*86*)
             if test -n "$USE_64"; then
                 CPU_ARCH=x86_64
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
+                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
+            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
     DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
     _OPTIMIZE_FLAGS=-O2
     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
     STRIP="$STRIP -x -S"
     DLL_SUFFIX=dylib