[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12880] trunk/blender/source/tools/guess/ guessconfig: revert change to bash ( I wasnt aware all shells supported the same conditionals)

Campbell Barton ideasman42 at gmail.com
Fri Dec 14 13:09:01 CET 2007


Revision: 12880
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12880
Author:   campbellbarton
Date:     2007-12-14 13:09:01 +0100 (Fri, 14 Dec 2007)

Log Message:
-----------
revert change to bash (I wasnt aware all shells supported the same conditionals)
only add _64 to the $CPU variable, not 32
so resulting solaris CPU names can be
sparc, sparc_64
i386, i386_64

Modified Paths:
--------------
    trunk/blender/source/tools/guess/guessconfig

Modified: trunk/blender/source/tools/guess/guessconfig
===================================================================
--- trunk/blender/source/tools/guess/guessconfig	2007-12-14 12:04:36 UTC (rev 12879)
+++ trunk/blender/source/tools/guess/guessconfig	2007-12-14 12:09:01 UTC (rev 12880)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # $Id$
 #
@@ -77,8 +77,10 @@
 
 # Patch Solaris
 if [ "$OS" = "solaris" ]; then
-    # will be 32 or 64, just adds the address space to the cpu
-    CPU=$CPU-`isainfo -b`
+    # Adds the address space to the cpu if its 64bit
+	if [ `isainfo -b` == "64" ]; then
+		CPU=$CPU_64
+	fi
 fi
 
 # Patch Windows





More information about the Bf-blender-cvs mailing list