DB switch in install-libs.sh, OS switch in build-all.sh

ciphrex · Aug 17, 2014 · e84c193 · e84c193
1 parent c8c00ec
commit e84c193
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/build-all.sh b/build-all.sh
@@ -6,6 +6,7 @@ do
     linux)
         if [[ ! -z "$OS" ]]; then echo "OS cannot be set twice"; exit 1; fi
         OS=linux
+        OPTIONS="OS=linux $OPTIONS"
     ;;
 
     mingw64)
@@ -18,6 +19,7 @@ do
     osx)
         if [[ ! -z "$OS" ]]; then echo "OS cannot be set twice"; exit 1; fi
         OS=osx
+        OPTIONS="OS=osx $OPTIONS"
     ;;
 
     debug)

diff --git a/install-libs.sh b/install-libs.sh
@@ -6,26 +6,31 @@ do
     linux)
         if [[ ! -z "$OS" ]]; then echo "OS cannot be set twice"; exit 1; fi
         OS=linux
+        OPTIONS="OS=linux $OPTIONS"
     ;;
 
     mingw64)
         if [[ ! -z "$OS" ]]; then echo "OS cannot be set twice"; exit 1; fi
         OS=mingw64
+        OPTIONS="OS=mingw64 $OPTIONS"
     ;;
 
     osx)
         if [[ ! -z "$OS" ]]; then echo "OS cannot be set twice"; exit 1; fi
         OS=osx
+        OPTIONS="OS=osx $OPTIONS"
     ;;
 
     sqlite)
         if [[ ! -z "$DB" ]]; then echo "DB cannot be set twice"; exit 1; fi
         DB=sqlite
+        OPTIONS="DB=sqlite $OPTIONS"
     ;;
 
     mysql)
         if [[ ! -z "$DB" ]]; then echo "DB cannot be set twice"; exit 1; fi
         DB=mysql
+        OPTIONS="DB=mysql $OPTIONS"
     ;;
 
     debug)