[ooo-build-commit] .: set_soenv.in

[Thorsten Behrens]

 set_soenv.in |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 8ae03ea3fa804eef0f69ed8759eb386d2cd7a464
Author: Christian Lohmaier <cloph at openoffice.org>
Date:   Tue Oct 5 20:42:06 2010 +0200

    Make Darwin platform detection more error resilient
    
    With recent XCode updates, on 10.4.0, apparently config.guess
    returns x86_64-apple-darwin10.4.0 which makes set_soenv fail
    spectacularly. Now, we just check for PPC, and default to i386
    for everything else (there's no 64 bit mac port anyway)

diff --git a/set_soenv.in b/set_soenv.in
index 65338a0..969a928 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -748,15 +748,7 @@ elsif ( $platform =~ m/darwin/ )
       $BIG_SVX        = "TRUE";
       $COM            = "GCC";
       $COMPATH        = '@COMPATH@'; 
-      if ($platform =~ m/^i[3456]86/)
-      {
-          print "Setting values for Mac OS X/Darwin on x86... ";
-          $outfile        = "MacOSXX86Env.Set"; 
-          $CPU            = "I";
-          $CPUNAME        = "INTEL";
-          $OUTPATH        = "unxmacxi";
-      }
-      elsif ($platform =~ m/^powerpc/)
+      if ($platform =~ m/^powerpc/)
       {
           print "Setting values for Mac OS X/Darwin on PowerPC... ";
           $outfile        = "MacOSXPPCEnv.Set"; 
@@ -764,6 +756,14 @@ elsif ( $platform =~ m/darwin/ )
           $CPUNAME        = "POWERPC";
           $OUTPATH        = "unxmacxp";
       }
+      else
+      {
+          print "Setting values for Mac OS X/Darwin on default x86... ";
+          $outfile        = "MacOSXX86Env.Set"; 
+          $CPU            = "I";
+          $CPUNAME        = "INTEL";
+          $OUTPATH        = "unxmacxi";
+      }
       if (@GCCVER@ >= 30401) {
 	  $CVER           = "C341";
       } else {