CVS: theedge/var/lib/lunar/functions optimize.lunar,1.41,1.42

[sofar at lunar-linux.org]

Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv20882/var/lib/lunar/functions

Modified Files:
	optimize.lunar 
Log Message:
Reverted tchans patch since that killed the optimizations on compile. Adding a line where the optimizations are read just before the menu's are run, so we're all happy now.


Index: optimize.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/optimize.lunar,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- optimize.lunar	7 Aug 2003 04:24:28 -0000	1.41
+++ optimize.lunar	7 Aug 2003 07:35:52 -0000	1.42
@@ -731,6 +731,32 @@
 
 optimize() {
   debug_msg "optimize ($@)"
+  # Source in the optimization settings if it exists.
+  if [ -s /etc/lunar/local/optimizations ] ; then
+    . /etc/lunar/local/optimizations
+  else
+    verbose_msg "initializing optimizations with hard-coded defaults"
+    echo -e PLATFORM=x86            '\n'    \
+BUILD=i386-pc-linux-gnu '\n'    \
+MAKES=                  '\n'    \
+COPT=                   '\n'    \
+CCOPT=                  '\n'    \
+BOPT=-O0                '\n'    \
+CPU=i386                '\n'    \
+SPD=( )                 '\n'    \
+STACK=                  '\n'    \
+XTRA=( )                '\n'    \
+FPM=                    '\n'    \
+CC_WARN=( )             '\n'    \
+CCC_WARN=( )            '\n'    \
+LDF=( )                 '\n'    \
+ADDON=( ) > /etc/lunar/local/optimizations
+  fi
+
+  #lets get the BUILD if it is not defined   
+  [ -z "$BUILD" ] && optimize_cpu $CPU
+  [ -n "$BUILD" ] && export BUILD || 
+  echo "Set your optimization preferences via lunar"
 
   unset CFLAGS CXXFLAGS LDFLAGS
 
@@ -810,34 +836,12 @@
     exit 0
   fi
 
-  # Source in the optimization settings if it exists.
-  if [ -s /etc/lunar/local/optimizations ] ; then
-    . /etc/lunar/local/optimizations
-  else
-    verbose_msg "initializing optimizations with hard-coded defaults"
-    echo -e PLATFORM=x86            '\n'    \
-            BUILD=i386-pc-linux-gnu '\n'    \
-            MAKES=                  '\n'    \
-            COPT=                   '\n'    \
-            CCOPT=                  '\n'    \
-            BOPT=-O0                '\n'    \
-            CPU=i386                '\n'    \
-            SPD=( )                 '\n'    \
-            STACK=                  '\n'    \
-            XTRA=( )                '\n'    \
-            FPM=                    '\n'    \
-            CC_WARN=( )             '\n'    \
-            CCC_WARN=( )            '\n'    \
-            LDF=( )                 '\n'    \
-            ADDON=( ) > /etc/lunar/local/optimizations
+  if [ -f /etc/lunar/local/optimizations ] ; then
+    .  /etc/lunar/local/optimizations
   fi
 
-  #lets get the BUILD if it is not defined   
-  [ -z "$BUILD" ] && optimize_cpu $CPU
-  [ -n "$BUILD" ] && export BUILD || 
-  echo "Set your optimization preferences via lunar"
-# Flow control for the menus. This will also check for gcc3,
-# if it exists it will allow more options.
+  # Flow control for the menus. This will also check for gcc3,
+  # if it exists it will allow more options.
   TITLE="Lunar Optimizations"
 
   help compiler_help          &&