diff options
| author | Andy Schwerin <Andy Schwerin schwerin@10gen.com> | 2012-03-07 12:14:38 -0500 |
|---|---|---|
| committer | Andy Schwerin <Andy Schwerin schwerin@10gen.com> | 2012-03-07 15:05:48 -0500 |
| commit | 322c3cc620d631640d7dc9ab2f99559ad6d25ba8 (patch) | |
| tree | 292d87b01093c3d2a7f4b388fcb673ef41b1a11d /SConstruct | |
| parent | f729d0c69bbaae99c38d56e8711c3ca9acb5c8c9 (diff) | |
| download | mongo-322c3cc620d631640d7dc9ab2f99559ad6d25ba8.tar.gz | |
SERVER-5172: Fix builds that set include and library paths.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 8c35e26e8ca..55faa96c50f 100644 --- a/SConstruct +++ b/SConstruct @@ -332,8 +332,8 @@ if has_option( "libpath" ): if has_option( "cpppath" ): env["CPPPATH"] = [get_option( "cpppath" )] -env.Append( CPPDEFINES=[ "_SCONS" , "MONGO_EXPOSE_MACROS" ], - CPPPATH=[ '$BUILD_DIR', "$BUILD_DIR/mongo" ] ) +env.Prepend( CPPDEFINES=[ "_SCONS" , "MONGO_EXPOSE_MACROS" ], + CPPPATH=[ '$BUILD_DIR', "$BUILD_DIR/mongo" ] ) if has_option( "safeshell" ): env.Append( CPPDEFINES=[ "MONGO_SAFE_SHELL" ] ) @@ -782,11 +782,11 @@ for shortName in getThirdPartyShortNames(): myModule.configure( env , fileLists , options_topass ) if not has_option("use-system-all") and not has_option("use-system-pcre"): - env.Append(CPPPATH=[ '$BUILD_DIR/third_party/pcre-${PCRE_VERSION}' ]) + env.Prepend(CPPPATH=[ '$BUILD_DIR/third_party/pcre-${PCRE_VERSION}' ]) if not has_option('use-system-all') and not has_option('use-system-boost'): - env.Append(CPPPATH=['$BUILD_DIR/third_party/boost'], - CPPDEFINES=['BOOST_ALL_NO_LIB']) + env.Prepend(CPPPATH=['$BUILD_DIR/third_party/boost'], + CPPDEFINES=['BOOST_ALL_NO_LIB']) env.Append( CPPPATH=['$EXTRACPPPATH'], LIBPATH=['$EXTRALIBPATH'] ) |