|
@@ -13,7 +13,7 @@ Index: git/SConstruct
|
|
|
===================================================================
|
|
|
--- git.orig/SConstruct
|
|
|
+++ git/SConstruct
|
|
|
-@@ -548,6 +548,7 @@ def variable_arch_converter(val):
|
|
|
+@@ -564,6 +564,7 @@ def variable_arch_converter(val):
|
|
|
'amd64': 'x86_64',
|
|
|
'emt64': 'x86_64',
|
|
|
'x86': 'i386',
|
|
@@ -21,7 +21,7 @@ Index: git/SConstruct
|
|
|
}
|
|
|
val = val.lower()
|
|
|
|
|
|
-@@ -627,7 +628,8 @@ env_vars.Add(
|
|
|
+@@ -652,7 +653,8 @@ env_vars.Add(
|
|
|
)
|
|
|
|
|
|
env_vars.Add('CC',
|
|
@@ -31,7 +31,7 @@ Index: git/SConstruct
|
|
|
|
|
|
env_vars.Add('CCFLAGS',
|
|
|
help='Sets flags for the C and C++ compiler',
|
|
|
-@@ -647,7 +649,8 @@ env_vars.Add('CPPPATH',
|
|
|
+@@ -672,7 +674,8 @@ env_vars.Add('CPPPATH',
|
|
|
converter=variable_shlex_converter)
|
|
|
|
|
|
env_vars.Add('CXX',
|
|
@@ -41,19 +41,19 @@ Index: git/SConstruct
|
|
|
|
|
|
env_vars.Add('CXXFLAGS',
|
|
|
help='Sets flags for the C++ compiler',
|
|
|
-@@ -895,6 +898,7 @@ envDict = dict(BUILD_ROOT=buildDir,
|
|
|
+@@ -961,6 +964,7 @@ envDict = dict(BUILD_ROOT=buildDir,
|
|
|
)
|
|
|
|
|
|
env = Environment(variables=env_vars, **envDict)
|
|
|
+env.PrependENVPath('PATH', os.getenv('PATH'))
|
|
|
del envDict
|
|
|
|
|
|
- env.AddMethod(env_os_is_wrapper, 'TargetOSIs')
|
|
|
+ env.AddMethod(mongo_platform.env_os_is_wrapper, 'TargetOSIs')
|
|
|
Index: git/src/mongo/util/SConscript
|
|
|
===================================================================
|
|
|
--- git.orig/src/mongo/util/SConscript
|
|
|
+++ git/src/mongo/util/SConscript
|
|
|
-@@ -274,6 +274,8 @@ if env['MONGO_ALLOCATOR'] == 'tcmalloc':
|
|
|
+@@ -329,6 +329,8 @@ if env['MONGO_ALLOCATOR'] == 'tcmalloc':
|
|
|
'MONGO_HAVE_GPERFTOOLS_SIZE_CLASS_STATS'
|
|
|
]
|
|
|
)
|