Fix build against static libboost

(cherry-picked from commit c51065e)
wesnoth · Oct 7, 2018 · a0c91ac · a0c91ac
1 parent 2a9c3d6
commit a0c91ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/SConstruct b/SConstruct
@@ -370,8 +370,9 @@ if env["prereqs"]:
         conf.CheckBoostIostreamsBZip2() & \
         conf.CheckBoost("random", require_version = boost_version) & \
         conf.CheckBoost("smart_ptr", header_only = True) & \
+	CheckAsio(conf) & \
+	conf.CheckBoost("thread") & \
         conf.CheckBoost("locale") & \
-        CheckAsio(conf) & \
         conf.CheckBoost("filesystem") \
             and Info("Base prerequisites are met")) \
             or Warning("Base prerequisites are not met")

diff --git a/scons/boost.py b/scons/boost.py
@@ -78,7 +78,7 @@ def CheckBoost(context, boost_lib, require_version = None, header_only = False):
         else:
             env.AppendUnique(CPPPATH = [boostdir], LIBPATH = [boostlibdir])
     if not header_only:
-        env.AppendUnique(LIBS = [libname])
+        env.PrependUnique(LIBS = [libname])
     if boost_lib == "thread" and env["PLATFORM"] == "posix":
         env.AppendUnique(CCFLAGS = ["-pthread"], LINKFLAGS = ["-pthread"])