Build : Make HOUDINI_CXX_FLAGS append rather than override CXXFLAGS

Author: andrewkaufman

SConstruct

@@ -2461,14 +2461,14 @@ if doConfigure :
 
 houdiniEnvSets = {
 	"IECORE_NAME" : "IECoreHoudini",
-	"CXXFLAGS" : dependencyIncludes + [ "$HOUDINI_CXX_FLAGS", "-DMAKING_DSO" ]
 }
 
 houdiniEnvAppends = {
 	"CXXFLAGS" : [
 		"-isystem", "$GLEW_INCLUDE_PATH",
 		"-isystem", "$HOUDINI_INCLUDE_PATH",
-		"-std=$CXXSTD",
+		"$HOUDINI_CXX_FLAGS",
+		"-DMAKING_DSO",
 	],
 	"CPPFLAGS" : [
 		pythonEnv["PYTHON_INCLUDE_FLAGS"],

config/ie/options

@@ -337,7 +337,7 @@ if targetApp=="houdini" :
 		USD_LIB_PREFIX = "libpxr_"
 		WITH_USD_MONOLITHIC = True
 
-	HOUDINI_CXX_FLAGS = " ".join( CXXFLAGS + houdiniReg['compilerFlags'] )
+	HOUDINI_CXX_FLAGS = " ".join( houdiniReg['compilerFlags'] )
 	INSTALL_HOUDINILIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_MAJOR_VERSION" )
 	INSTALL_HOUDINIPLUGIN_NAME = os.path.join( appPrefix, "plugins", "$IECORE_NAME" )
 	INSTALL_HOUDINIOTL_DIR = os.path.join( appPrefix, "otls" )