From c78f8b3292d36780679f1d5d54be07c1d6bc705b Mon Sep 17 00:00:00 2001
From: ThePhD <phdofthehouse@gmail.com>
Date: Thu, 25 Feb 2016 09:26:28 -0500
Subject: [PATCH] And finally, proper library control.

---
 .travis.yml  | 4 ++--
 bootstrap.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f51a26d..3176ce51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,9 @@ before_install:
     - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
     - sudo add-apt-repository -y ppa:saiarcot895/chromium-beta
     - sudo apt-get --yes update
-    - if [ "$CXX" == "g++" ]; then sudo apt-get --yes install g++-4.9; fi
+    - sudo apt-get --yes install g++-4.9
+    - sudo apt-get --yes install clang-3.5
     - if [ "$CXX" == "g++" ]; then export CXX=g++-4.9; fi
-    - if [ "$CXX" == "clang++" ]; then sudo apt-get --yes install clang-3.5; fi
     - if [ "$CXX" == "clang++" ]; then export CXX=clang++-3.5; fi
     - sudo apt-get --yes install ninja-build
     - sudo apt-get --yes install liblua5.2-dev
diff --git a/bootstrap.py b/bootstrap.py
index 57f09718..ece4564a 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -81,9 +81,6 @@ if args.lua_dir:
     include.extend([os.path.join(args.lua_dir, 'include')])
     ldflags.extend(library_includes([os.path.join(args.lua_dir, 'lib')]))
 
-if args.lua_lib:
-    ldflags.extend(libraries([args.lua_lib]))
-
 if args.ci:
     ldflags.extend(library_includes(['lib']))
     include.extend(['./include'])
@@ -95,6 +92,9 @@ if args.ci:
             include.extend(['/usr/include/' + args.lua_lib])
     else:
         include.extend(['/usr/include/lua-5.3', '/usr/include/lua-5.2', '/usr/include/lua-5.1', '/usr/include/luajit-2.0'])
+else:
+    if args.lua_lib:
+        ldflags.extend(libraries([args.lua_lib]))
 
 if args.testing:
     cxxflags.append('-Wmissing-declarations')