diff options
| author | Andrew Morrow <acm@10gen.com> | 2013-06-05 14:51:07 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@10gen.com> | 2013-06-06 10:21:27 -0400 |
| commit | bc08f8a73aeedb1511c699290029e22e9bad1324 (patch) | |
| tree | f4ee01880253b2d8caa2fb68edda33fa4a72c2c4 | |
| parent | 01fa5e94422bdd29810e1aa5e5db54b6ce68fc24 (diff) | |
| download | mongo-bc08f8a73aeedb1511c699290029e22e9bad1324.tar.gz | |
SERVER-6514 Ensure libmongclient precedes other libraries
(cherry picked from commit 8752f3576634716b3ff81b8d0d99b5b6abc61165)
| -rw-r--r-- | src/SConscript.client | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/SConscript.client b/src/SConscript.client index 9bf8757473a..18cab70b90d 100644 --- a/src/SConscript.client +++ b/src/SConscript.client @@ -243,9 +243,10 @@ exampleObjMap = [(target, clientEnv.Object(source)) for (target, source) in exam # we need to use LIBS. For in-tree builds we need LIBDEPS. staticClientEnv = clientEnv.Clone() if '_LIBDEPS' in clientEnv: - staticClientEnv.AppendUnique(LIBDEPS=[mongoClientStaticLib]) + staticClientEnv.PrependUnique(LIBDEPS=[mongoClientStaticLib]) else: - staticClientEnv.AppendUnique(LIBS=[mongoClientStaticLib]) + # We need the mongo client library to preceed the boost libraries. + staticClientEnv.PrependUnique(LIBS=[mongoClientStaticLib]) # Build each statically linked client program staticClientPrograms = [staticClientEnv.Program(target, obj) for (target, obj) in exampleObjMap] @@ -264,12 +265,12 @@ if buildShared: # dylib in #sharedclient, which has @executable path set as its install_name. if nix: if darwin: - sharedClientEnv.AppendUnique( + sharedClientEnv.PrependUnique( LIBS=['mongoclient'], LIBPATH=["#/sharedclient"] ) else: - sharedClientEnv.AppendUnique( + sharedClientEnv.PrependUnique( LIBS=[mongoClientSharedLib], LINKFLAGS="-Wl,-z,origin", RPATH=[sharedClientEnv.Literal("\\$$ORIGIN")]) |