summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Defaults.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-01-11 03:17:45 (GMT)
committerSteven Knight <knight@baldmt.com>2002-01-11 03:17:45 (GMT)
commit73d5fcf51f9002bb3a0da8a32576b2e8ce0cb54a (patch)
treea8312b6ab6dc5cdd45c711c757dd59150223efdc /src/engine/SCons/Defaults.py
parent74c6fdcbeadb1b42f134f7f9b864763d29bb8338 (diff)
downloadSCons-73d5fcf51f9002bb3a0da8a32576b2e8ce0cb54a.zip
SCons-73d5fcf51f9002bb3a0da8a32576b2e8ce0cb54a.tar.gz
SCons-73d5fcf51f9002bb3a0da8a32576b2e8ce0cb54a.tar.bz2
Check for the existence of lex and yacc in those tests and bail with NO RESULT if they're not present..
Diffstat (limited to 'src/engine/SCons/Defaults.py')
-rw-r--r--src/engine/SCons/Defaults.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index 056b1f3..450575c 100644
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -129,7 +129,7 @@ def get_msvc_path (path, version, platform='x86'):
access the registry or appropriate registry keys not found.
"""
- if not _can_read_reg:
+ if not SCons.Util.can_read_reg:
raise InternalError, "No Windows registry module was found"
if path=='lib':
@@ -272,8 +272,9 @@ elif os.name == 'nt':
# so fall back to a reasonable default:
MVSdir = r'C:\Program Files\Microsoft Visual Studio'
MVSVCdir = r'%s\VC98' % MVSdir
+ MVSCommondir = r'%s\Common' % MVSdir
ConstructionEnvironment = make_win32_env_from_paths(
r'%s\atl\include;%s\mfc\include;%s\include' % (MVSVCdir, MVSVCdir, MVSVCdir),
r'%s\mvc\lib;%s\lib' % (MVSVCdir, MVSVCdir),
- os.environ["PATH"])
+ (r'%s\MSDev98\Bin' % MVSCommondir) + os.pathsep + os.environ["PATH"])