summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2014-03-09 05:00:34 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2014-03-09 05:00:34 (GMT)
commite775b746964849812ca7cf1cee8ecee4bfa02864 (patch)
tree83a794b9d58d32d6af1c2d147b3c49ed37370fc3 /src/script
parente9c54eebe5f3ff43cd51a83cc5ed9a90f9ea9ed0 (diff)
downloadSCons-e775b746964849812ca7cf1cee8ecee4bfa02864.zip
SCons-e775b746964849812ca7cf1cee8ecee4bfa02864.tar.gz
SCons-e775b746964849812ca7cf1cee8ecee4bfa02864.tar.bz2
restore SCONS_LIB_DIR to primary choice for SCons logic, then source tree from which it was run.
Diffstat (limited to 'src/script')
-rw-r--r--src/script/scons.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/script/scons.py b/src/script/scons.py
index 8dcc371..7de0b10 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