basePythonEnv

Author: murraystevenson

SConstruct

@@ -1167,46 +1167,47 @@ def pythonVersion( pythonEnv ) :
 		universal_newlines = True
 	).strip()
 
-pythonEnv = env.Clone()
+basePythonEnv = env.Clone()
 
 # decide where python is
-if pythonEnv["PYTHON"]=="" :
+if basePythonEnv["PYTHON"]=="" :
 	if env["PLATFORM"] == "win32" :
 		sys.stderr.write( "ERROR : Python executable path must be set with PYTHON option.\n" )
 		Exit( 1 )
 	else:
-		pythonEnv["PYTHON"] = getPythonConfig( pythonEnv, "--exec-prefix" ) + "/bin/python"
+		basePythonEnv["PYTHON"] = getPythonConfig( basePythonEnv, "--exec-prefix" ) + "/bin/python"
 
 # run it to determine version
-pythonEnv["PYTHON_VERSION"] = pythonVersion( pythonEnv )
+basePythonEnv["PYTHON_VERSION"] = pythonVersion( basePythonEnv )
 
 # get the include path for python if we haven't been told it explicitly
 # Windows does not have python-config so rely the user setting the appropriate options
 if env["PLATFORM"] != "win32" :
-	if pythonEnv["PYTHON_INCLUDE_PATH"]=="" :
-		pythonEnv["PYTHON_INCLUDE_FLAGS"] = getPythonConfig( pythonEnv, "--includes" ).split()
+	if basePythonEnv["PYTHON_INCLUDE_PATH"]=="" :
+		basePythonEnv["PYTHON_INCLUDE_FLAGS"] = getPythonConfig( basePythonEnv, "--includes" ).split()
 	else :
-		pythonEnv["PYTHON_INCLUDE_FLAGS"] = [ systemIncludeArgument, "$PYTHON_INCLUDE_PATH" ]
+		basePythonEnv["PYTHON_INCLUDE_FLAGS"] = [ systemIncludeArgument, "$PYTHON_INCLUDE_PATH" ]
 
-	pythonEnv.Append( CXXFLAGS = "$PYTHON_INCLUDE_FLAGS" )
+	basePythonEnv.Append( CXXFLAGS = "$PYTHON_INCLUDE_FLAGS" )
 
 	if env["PLATFORM"] == "posix" :
 		## We really want to not have the -Wno-strict-aliasing flag, but it's necessary to stop boost
 		# python warnings that don't seem to be prevented by including boost via -isystem even. Better to
 		# be able to have -Werror but be missing one warning than to have no -Werror.
 		## \todo This is probably only necessary for specific gcc versions where -isystem doesn't
 		# fully work. Reenable when we encounter versions that work correctly.
-		pythonEnv.Append( CXXFLAGS = [ "-Wno-strict-aliasing" ] )
+		basePythonEnv.Append( CXXFLAGS = [ "-Wno-strict-aliasing" ] )
 
 	# get the python link flags
-	if pythonEnv["PYTHON_LINK_FLAGS"]=="" :
-		pythonEnv["PYTHON_LINK_FLAGS"] = getPythonConfig( pythonEnv, "--ldflags" )
-		pythonEnv["PYTHON_LINK_FLAGS"] = pythonEnv["PYTHON_LINK_FLAGS"].replace( "Python.framework/Versions/" + pythonEnv["PYTHON_VERSION"] + "/Python", "" )
+	if basePythonEnv["PYTHON_LINK_FLAGS"]=="" :
+		basePythonEnv["PYTHON_LINK_FLAGS"] = getPythonConfig( basePythonEnv, "--ldflags" )
+		basePythonEnv["PYTHON_LINK_FLAGS"] = basePythonEnv["PYTHON_LINK_FLAGS"].replace( "Python.framework/Versions/" + basePythonEnv["PYTHON_VERSION"] + "/Python", "" )
 
-	pythonEnv.Append( SHLINKFLAGS = pythonEnv["PYTHON_LINK_FLAGS"].split() )
+	basePythonEnv.Append( SHLINKFLAGS = basePythonEnv["PYTHON_LINK_FLAGS"].split() )
 else :
-	pythonEnv["PYTHON_INCLUDE_FLAGS"] = ""
+	basePythonEnv["PYTHON_INCLUDE_FLAGS"] = ""
 
+pythonEnv = basePythonEnv.Clone()
 pythonEnv.Append( CPPFLAGS = "-DBOOST_PYTHON_MAX_ARITY=20" )
 
 # if BOOST_PYTHON_LIB_SUFFIX is provided, use it
@@ -2066,7 +2067,9 @@ usdEnvSets = {
 	"IECORE_NAME" : "IECoreUSD"
 }
 
-usdEnv = env.Clone( **usdEnvSets )
+# We are deliberately cloning from `basePythonEnv` rather than
+# `env` because USD itself has dependencies on Python.
+usdEnv = basePythonEnv.Clone( **usdEnvSets )
 
 if usdEnv["WITH_USD_MONOLITHIC"] :
 	usdLibs = [ "usd_ms" ]
@@ -2116,7 +2119,6 @@ usdEnvAppends = {
 	"CPPPATH" : [
 		"contrib/IECoreUSD/include",
 		"contrib/IECoreUSD/src",
-		"$PYTHON_INCLUDE_PATH",
 	],
 	"LIBPATH" : [
 		"$USD_LIB_PATH"