From 037f251e6c2d5d638f1bd6b8dc58ea1eaece2b3e Mon Sep 17 00:00:00 2001
From: Kevin Day <thekevinday@gmail.com>
Date: Thu, 8 Jan 2015 20:57:44 -0600
Subject: [PATCH] Bugfix: remove more cases where build_alt variables where
 still being used

---
 build/scripts/generate.sh | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/build/scripts/generate.sh b/build/scripts/generate.sh
index 7ae9afb..f47a664 100644
--- a/build/scripts/generate.sh
+++ b/build/scripts/generate.sh
@@ -327,7 +327,6 @@ generate_operation_build(){
     if [[ $sources_library != "" ]] ; then
       for i in $sources_library ; do
         sources="$sources${path_build}libraries/$i.o "
-        sources_alt="$sources_alt$sources "
 
         echo $compiler $path_c$i -c -static -o ${path_build}libraries/$i.o $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_library)]} 
         $compiler $path_c$i -c -static -o ${path_build}libraries/$i.o $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_library)]} || failure=1
@@ -338,38 +337,25 @@ generate_operation_build(){
       done
 
       if [[ $failure == "" ]] ; then
-        echo $linker rcs ${path_build}libraries/lib$name.a $sources_alt
-        $linker rcs ${path_build}libraries/lib$name.a $sources_alt || failure=1
+        echo $linker rcs ${path_build}libraries/lib$name.a $sources
+        $linker rcs ${path_build}libraries/lib$name.a $sources || failure=1
       fi
     fi
 
     if [[ $failure == "" && $sources_program != "" ]] ; then
       sources=
-      sources_alt=
-      if [[ $alt == "alt" ]] ; then
-        if [[ $sources_library != "" ]] ; then
-          for i in $sources_library ; do
-            sources_alt="$sources_alt$path_c$i "
-          done
-        fi
-
-        for i in $sources_program ; do
-          sources_alt="$sources_alt$path_c$i "
-        done
-      else
-        if [[ $sources_library != "" ]] ; then
-          for i in $sources_library ; do
-            sources="$sources$path_c$i "
-          done
-        fi
-
-        for i in $sources_program ; do
+      if [[ $sources_library != "" ]] ; then
+        for i in $sources_library ; do
           sources="$sources$path_c$i "
         done
       fi
 
-      echo $compiler $sources -static -o ${path_build}programs/$name $sources_alt $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_program)]}
-      $compiler $sources -static -o ${path_build}programs/$name $sources_alt $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_program)]} || failure=1
+      for i in $sources_program ; do
+        sources="$sources$path_c$i "
+      done
+
+      echo $compiler -static -o ${path_build}programs/$name $sources $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_program)]}
+      $compiler -static -o ${path_build}programs/$name $sources $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_program)]} || failure=1
     fi
   fi
 
-- 
1.8.3.1