Move adding SRCDIR/python to sys.path from

multiple SConscript files to SConstruct.

build/SConstruct:
    Add SRCDIR/python to sys.path here.
python/SConscript:
    Move adding SRCDIR/python to sys.path to SConstruct.

--HG--
extra : convert_revision : f598d670650f5b4fd501caaf073fe38b44d21855

diff --git a/build/SConstruct b/build/SConstruct
index 0f688ac3b14da80c4389f876355d41758db54602..e333732434255cbaaac17eed33c3ab4e72aac204 100644 (file)
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -62,6 +62,9 @@ if not os.path.isdir('ext'):
           % EXT_SRCDIR
     sys.exit(1)
 
+# tell python where to find m5 python code
+sys.path.append(os.path.join(SRCDIR, 'python'))
+
 
 ###################################################
 #

diff --git a/python/SConscript b/python/SConscript
index 8404bc4bd82c53ec9d0c47683699c35e49553fa5..9c15c6d50124767e11549732a0d5b30b3fe31288 100644 (file)
--- a/python/SConscript
+++ b/python/SConscript
@@ -30,9 +30,6 @@ import os, os.path, re, sys
 
 Import('env')
 
-# tell python where to find m5 python code
-sys.path.append(os.path.join(env['SRCDIR'], 'python'))
-
 import m5scons
 
 def WriteEmbeddedPyFile(target, source, path, name, ext, filename):