Skip to content

Commit 5cf07ef

Browse files
committed
Allow using system scons instead of chromium one
1 parent 58d6df9 commit 5cf07ef

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

site_scons/site_init.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ def CheckSConsLocation():
2828
Without this, if system scons is used then it produces rather cryptic error
2929
messages.
3030
"""
31+
# Daemon: use system scons instead!
32+
return
33+
3134
scons_location = os.path.dirname(os.path.abspath(SCons.__file__))
3235
nacl_dir = os.path.dirname(os.path.dirname(os.path.dirname(
3336
os.path.abspath(__file__))))
@@ -364,7 +367,8 @@ def SiteInitMain():
364367
# Since our site dir was specified on the SCons command line, SCons will
365368
# normally only look at our site dir. Add back checking for project-local
366369
# site_scons directories.
367-
if not SCons.Script.GetOption('no_site_dir'):
370+
# WTF? scons docs say no_site_dir is still supposed to exist, but it raises an attribute error...
371+
if False: # not SCons.Script.GetOption('no_site_dir'):
368372
SCons.Script.Main._load_site_scons_dir(
369373
SCons.Node.FS.get_default_fs().SConstruct_dir.__str__(), None)
370374

0 commit comments

Comments
 (0)