[Lunar-commits] <moonbase-core> optimization-plugins: moved the defaults variables

[Stefan Wold]

commit 794d4d100c4c6bf8b59a1556eb8e83ea3a0336ea
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 23 Nov 2013 12:39:07 -0800
URL: https://github.com/lunar-linux/moonbase-core/commit/794d4d100c4c6bf8b59a1556eb8e83ea3a0336ea

optimization-plugins: moved the defaults variables

Moved the defaults for the menus to conform with the rest of the code
---
  compilers/gcc/plugin.d/optimize-gcc_4_8.plugin | +5/-5     
  devel/binutils/plugin.d/optimize-gnu_ld.plugin | +3/-3     
  utils/ccache/plugin.d/optimize-ccache.plugin   | +3/-2     
  3 files changed, 11 insertions(+), 10 deletions(-)

--- a/compilers/gcc/plugin.d/optimize-gcc_4_8.plugin
+++ b/compilers/gcc/plugin.d/optimize-gcc_4_8.plugin
@@ -215,13 +215,13 @@ STACK=$STACK
 EOF
   }
 
+  # default optimizations
+  BOPT=Faster
+  CC_OPTS=( Pipe Fortify )
+  CPU=$(arch | sed 's;_;-;')
+
   if [ -f /etc/lunar/local/optimizations.GCC_4_8 ]; then
     . /etc/lunar/local/optimizations.GCC_4_8
-  else
-    # default optimizations
-    BOPT=Faster
-    CC_OPTS=( Pipe Fortify )
-    CPU=$(arch | sed 's;_;-;')
   fi
 
   export IFS=$'\t\n'
--- a/devel/binutils/plugin.d/optimize-gnu_ld.plugin
+++ b/devel/binutils/plugin.d/optimize-gnu_ld.plugin
@@ -63,12 +63,12 @@ plugin_gnu_ld_optimize_menu()
     return 2
   fi
 
+  # default optimizations
+  LDF=( Strip )
+
   # load previous optimizations
   if [ -e /etc/lunar/local/optimizations.GNU_LD ]; then
     . /etc/lunar/local/optimizations.GNU_LD
-  else
-    # default optimizations
-    LDF=( Strip )
   fi
 
   save_optimizations()
--- a/utils/ccache/plugin.d/optimize-ccache.plugin
+++ b/utils/ccache/plugin.d/optimize-ccache.plugin
@@ -37,11 +37,12 @@ plugin_ccache_optimize_menu()
     return 2
   fi
 
+  # Defaults
+  USE_CCACHE="yes"
+
   # load previous optimizations
   if [ -e /etc/lunar/local/optimizations.CCACHE ]; then
     . /etc/lunar/local/optimizations.CCACHE
-  else
-    USE_CCACHE="yes"
   fi
 
   save_optimizations()