← Back to branch summary

~extension-hackers/globalmenu-extension/3.5

« back to all changes in this revision

Viewing changes to build/macosx/universal/mozconfig.common

  • Committer: Chris Coulson
  • Date: 2011-08-05 17:37:02 UTC
  • Revision ID: chrisccoulson@ubuntu.com-20110805173702-n11ykbt0tdp5u07q
Refresh build system from FIREFOX_6_0b5_BUILD1

Show diffs side-by-side

added added

removed removed

Lines of Context:
build/macosx/universal/mozconfig.common
53
53
if test -n "$MOZ_BUILD_APP" ; then
54
54
if test "$MOZ_BUILD_APP" = "i386" -o  "$MOZ_BUILD_APP" = "ppc" -o "$MOZ_BUILD_APP" = "x86_64"; then
55
55
  TARGET_CPU=$MOZ_BUILD_APP
56
 
  GCC_VERSION=4.2
 
56
 
 
57
  if test -z "$CC" ; then
 
58
     CC=gcc-4.2
 
59
  fi
 
60
 
 
61
  if test -z "$CXX" ; then
 
62
     CXX=g++-4.2
 
63
  fi
 
64
 
 
65
  # $HOST_CXX is presently unused.  $HOST_CC will only be used during a cross
 
66
  # compile.
 
67
  HOST_CC=$CC
 
68
  HOST_CXX=$CXX
 
69
 
 
70
  NATIVE_CPU=`$topsrcdir/build/autoconf/config.guess | cut -f1 -d-`
 
71
  if test "$NATIVE_CPU" = "powerpc" ; then
 
72
    NATIVE_CPU=ppc
 
73
  fi
57
74
 
58
75
  # It's not strictly necessary to specify -arch during native builds, but it
59
76
  # makes the merged about:buildconfig easier to follow, and it reduces
60
77
  # conditionalized differences between builds.
61
 
  CC="gcc-$GCC_VERSION -arch $TARGET_CPU"
62
 
  CXX="g++-$GCC_VERSION -arch $TARGET_CPU"
63
 
 
64
 
  # $HOST_CXX is presently unused.  $HOST_CC will only be used during a cross
65
 
  # compile.  Always use the 4.2 compiler, since it will always be present and
66
 
  # will always work.
67
 
  HOST_CC=gcc-4.2
68
 
  HOST_CXX=g++-4.2
 
78
  CC="$CC -arch $TARGET_CPU"
 
79
  CXX="$CXX -arch $TARGET_CPU"
69
80
 
70
81
  # These must be set for cross builds, and don't hurt straight builds.
71
82
  RANLIB=ranlib
74
85
  LD=ld
75
86
  STRIP="strip -x -S"
76
87
 
77
 
  NATIVE_CPU=`$topsrcdir/build/autoconf/config.guess | cut -f1 -d-`
78
 
  if test "$NATIVE_CPU" = "powerpc" ; then
79
 
    NATIVE_CPU=ppc
80
 
  fi
81
 
 
82
88
  # Let configure know that we mean business.
83
89
  if test "$NATIVE_CPU" != "$TARGET_CPU" ; then
84
90
    CROSS_COMPILE=1