Skip to content

Commit b20136b

Browse files
committed
Avoid depending on another NaCl toolchain for gdb
Disable GDB tests by default and when they are disabled don't try to look for a 2nd NaCl toolchain just to grab its GDB. GDB tests on Linux are broken for me anyway in upstream with the incompatibly old curses lib dependency issue.
1 parent 2aea5fc commit b20136b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ def SetUpArgumentBits(env):
382382
'to run the specified test(s) without actually running them. This '
383383
'argument is a counterpart to built_elsewhere.')
384384

385-
BitFromArgument(env, 'no_gdb_tests', default=False,
385+
BitFromArgument(env, 'no_gdb_tests', default=True,
386386
desc='Prevents GDB tests from running. If GDB is not available, you can '
387387
'test everything else by specifying this flag.')
388388

site_scons/site_tools/naclsdk.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,8 @@ def FakeInstall(dest, source, env):
755755
else:
756756
_SetEnvForNativeSdk(env, root)
757757

758-
if (env.Bit('bitcode') or env.Bit('nacl_clang')) and env.Bit('build_x86'):
758+
# Daemon: don't depend on a second NaCl toolchain!
759+
if (env.Bit('bitcode') or env.Bit('nacl_clang')) and env.Bit('build_x86') and not env.Bit('no_gdb_tests'):
759760
# Get GDB from the nacl-gcc glibc toolchain even when using PNaCl.
760761
# TODO(mseaborn): We really want the nacl-gdb binary to be in a
761762
# separate tarball from the nacl-gcc toolchain, then this step

0 commit comments

Comments
 (0)