From 83dcb68468ebb0e2da7d768ce83592c1bccd96dc Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Fri, 15 Sep 2017 02:56:40 +0000 Subject: Revert "[lit] Force site configs to run before source-tree configs" This patch is still breaking several multi-stage compiler-rt bots. I already know what the fix is, but I want to get the bots green for now and then try re-applying in the morning. llvm-svn: 313335 --- compiler-rt/unittests/lit.common.unit.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler-rt/unittests') diff --git a/compiler-rt/unittests/lit.common.unit.cfg b/compiler-rt/unittests/lit.common.unit.cfg index 31206e913bf..b08c1fe1283 100644 --- a/compiler-rt/unittests/lit.common.unit.cfg +++ b/compiler-rt/unittests/lit.common.unit.cfg @@ -16,7 +16,7 @@ config.test_format = lit.formats.GoogleTest(llvm_build_mode, "Test") config.suffixes = [] # Tweak PATH to include llvm tools dir. -llvm_tools_dir = config.llvm_tools_dir +llvm_tools_dir = getattr(config, 'llvm_tools_dir', None) if (not llvm_tools_dir) or (not os.path.exists(llvm_tools_dir)): lit_config.fatal("Invalid llvm_tools_dir config attribute: %r" % llvm_tools_dir) path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH'])) -- cgit v1.2.1