diff options
| author | Randall Hunt <randall.hunt@10gen.com> | 2012-09-18 19:10:54 -0400 |
|---|---|---|
| committer | Randall Hunt <randall.hunt@10gen.com> | 2012-09-18 19:13:08 -0400 |
| commit | 563d64e6f818ac0ded034e1f3a1ce62c78860df8 (patch) | |
| tree | c2e4e0fa6783a0ff603cdcf52b5b58a4ab09b932 /SConstruct | |
| parent | bde4065f5a32c12948460369b3a99d28f1ffda15 (diff) | |
| download | mongo-563d64e6f818ac0ded034e1f3a1ce62c78860df8.tar.gz | |
Fix BUILDBOT-185 by checking env['MONGO_MODULES'] and adding it to the build name
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index 27d542ef1d9..02cb3bc4d0f 100644 --- a/SConstruct +++ b/SConstruct @@ -927,7 +927,6 @@ env.Alias( "style" , [] , [ doStyling ] ) env.AlwaysBuild( "style" ) - # ---- INSTALL ------- def getSystemInstallName(): @@ -936,19 +935,21 @@ def getSystemInstallName(): n += "-static" if has_option("nostrip"): n += "-debugsymbols" - if nix and os.uname()[2].startswith( "8." ): + if nix and os.uname()[2].startswith("8."): n += "-tiger" + if len(env.get("MONGO_MODULES", None)): + n += "-" + "-".join(env["MONGO_MODULES"].keys()) + try: findSettingsSetup() import settings - if "distmod" in dir( settings ): - n = n + "-" + str( settings.distmod ) + if "distmod" in dir(settings): + n = n + "-" + str(settings.distmod) except: pass - - dn = GetOption( "distmod" ) + dn = GetOption("distmod") if dn and len(dn) > 0: n = n + "-" + dn |