backout bug 645459 from NSPR because of a build failure on OSX 64 bit
☠☠ backed out by 0e25d6182131 ☠ ☠
authorKai Engert <kaie@kuix.de>
Wed, 04 May 2011 11:49:42 +0200
changeset 69298 c89356582dc948908b31cdfcdd22371fd0ba8b3f
parent 69297 d30b2e9c999a43ffa9abf7429a27432430813738
child 69299 5b8ade677818a36ca76de94bec5c52d36a85f911
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)
bugs645459
milestone6.0a1
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 bug 645459 from NSPR because of a build failure on OSX 64 bit
nsprpub/configure
nsprpub/configure.in
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3536,22 +3536,20 @@ 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,22 +1139,20 @@ 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