diff options
| author | William Deegan <bill@baddogconsulting.com> | 2014-03-08 21:00:34 -0800 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2014-03-08 21:00:34 -0800 |
| commit | 4e4788f0e37f9d3176b2a9feda058cef551f9e80 (patch) | |
| tree | 83a794b9d58d32d6af1c2d147b3c49ed37370fc3 | |
| parent | c20feb822d7b125b2e373805ee8266b68a2df8a8 (diff) | |
| download | scons-4e4788f0e37f9d3176b2a9feda058cef551f9e80.tar.gz | |
restore SCONS_LIB_DIR to primary choice for SCons logic, then source tree from which it was run.
| -rw-r--r-- | src/script/scons.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/script/scons.py b/src/script/scons.py index 8dcc371d..7de0b103 100644 --- a/src/script/scons.py +++ b/src/script/scons.py @@ -38,6 +38,7 @@ __developer__ = "__DEVELOPER__" import os import sys + ############################################################################## # BEGIN STANDARD SCons SCRIPT HEADER # @@ -72,6 +73,11 @@ libs = [] if "SCONS_LIB_DIR" in os.environ: libs.append(os.environ["SCONS_LIB_DIR"]) +# - running from source takes priority (since 2.3.2) +script_path = os.path.abspath(os.path.dirname(__file__)) +source_path = os.path.join(script_path, '..', 'engine') +libs.append(source_path) + local_version = 'scons-local-' + __version__ local = 'scons-local' if script_dir: @@ -85,9 +91,6 @@ scons_version = 'scons-%s' % __version__ # preferred order of scons lookup paths prefs = [] -# - running from source takes priority (since 2.3.2) -script_path = os.path.abspath(os.path.dirname(__file__)) -source_path = os.path.join(script_path, '..', 'engine') # - running from egg check try: @@ -176,7 +179,7 @@ else: libs.extend([os.path.join(x, scons_version) for x in prefs]) libs.extend([os.path.join(x, 'scons') for x in prefs]) -sys.path = [source_path] + libs + sys.path +sys.path = libs + sys.path ############################################################################## # END STANDARD SCons SCRIPT HEADER |