summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorJonathan Reams <jbreams@mongodb.com>2014-06-19 11:49:38 -0400
committerJonathan Reams <jbreams@mongodb.com>2014-06-19 13:39:22 -0400
commitf4766f8b629857efd82535d02c3402a8b214dd41 (patch)
tree98fe07f60d678aa37cac1702309281c43ff0fc45 /SConstruct
parent69771e18ff4ff572924a4242f807cdbeccb60a87 (diff)
downloadmongo-f4766f8b629857efd82535d02c3402a8b214dd41.tar.gz
SERVER-14059 Allow overriding of dist architecture name in scons
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct5
1 files changed, 4 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 893ec7f4194..8735d673d0f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -191,6 +191,7 @@ add_option( "mute" , "do not display commandlines for compiling and linking, to
add_option( "prefix" , "installation prefix" , 1 , False, default=DEFAULT_INSTALL_DIR )
add_option( "distname" , "dist name (0.8.0)" , 1 , False )
add_option( "distmod", "additional piece for full dist name" , 1 , False )
+add_option( "distarch", "override the architecture name in dist output" , 1 , False )
add_option( "nostrip", "do not strip installed binaries" , 0 , False )
add_option( "extra-variant-dirs", "extra variant dir components, separated by commas", 1, False)
add_option( "add-branch-to-variant-dir", "add current git branch to the variant dir", 0, False )
@@ -1817,7 +1818,9 @@ env.AlwaysBuild( "lint" )
# ---- INSTALL -------
def getSystemInstallName():
- n = platform + "-" + processor
+ dist_arch = GetOption("distarch")
+ arch_name = processor if not dist_arch else dist_arch
+ n = platform + "-" + arch_name
if static:
n += "-static"
if has_option("nostrip"):