diff --git a/SConstruct b/SConstruct index a48f1ef19631..b9848927c1f8 100755 --- 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 index 3e055ccfa542..7b5551715934 100644 --- 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"])