From: Nathan Binkert <binkertn@umich.edu>
Date: Mon, 16 Aug 2004 21:27:38 +0000 (-0400)
Subject: Fix SConstruct file to allow you to override the compilers
X-Git-Tag: m5_1.0_tutorial~192
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ac8b01db7101e8990ae93c87c6a09ee978732175;p=gem5.git

Fix SConstruct file to allow you to override the compilers

build/SConstruct:
    Make it possible to override the CC and CXX environment
    variables.

--HG--
extra : convert_revision : e1b68ae9b1b7011cc494bfa9ee688aa72929a2e3
---

diff --git a/build/SConstruct b/build/SConstruct
index 381b6ecda..41baa2d9c 100644
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -239,6 +239,15 @@ default_env = Environment(ENV = os.environ,  # inherit user's enviroment vars
                           FULL_SYSTEM = False,
                           USE_MYSQL = False)
 
+# For some reason, the CC and CXX variables don't get passed into the
+# environment correctly.  This is probably some sort of scons bug that
+# will eventually be fixed.
+if os.environ.has_key('CC'):
+    default_env.Replace(CC=os.environ['CC'])
+
+if os.environ.has_key('CXX'):
+    default_env.Replace(CXX=os.environ['CXX'])
+
 # M5_EXT is used by isa_parser.py to find the PLY package.
 default_env.Append(ENV = { 'M5_EXT' : EXT_SRCDIR })