Index: buildbot/osuosl/master/config/builders.py =================================================================== --- buildbot/osuosl/master/config/builders.py +++ buildbot/osuosl/master/config/builders.py @@ -99,7 +99,6 @@ 'slavenames':["aarch64-foundation"], 'builddir':"llvm-aarch64-linux", 'factory': LLVMBuilder.getLLVMBuildFactory(config_name='Release+Asserts', - outOfDir=True, extra_configure_args=["--host=aarch64-linux-gnu"])}, {'name': "llvm-hexagon-elf", 'slavenames':["hexagon-build-03"], @@ -174,8 +173,7 @@ env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin', 'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes'}, stage1_config='Release+Asserts', - checkout_compiler_rt=True, - outOfDir=True)}, + checkout_compiler_rt=True)}, {'name': "llvm-clang-lld-x86_64-debian-fast", 'slavenames':["gribozavr4"], @@ -420,7 +418,7 @@ {'name' : "clang-x86_64-darwin13-cross-mingw32", 'slavenames' :["as-bldslv9"], 'builddir' :"clang-x86_64-darwin13-cross-mingw32", - 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, use_pty_in_tests=True, + 'factory' : ClangBuilder.getClangBuildFactory(use_pty_in_tests=True, test=False, env = { 'CC' : 'clang', 'CXX' : 'clang++', @@ -432,7 +430,7 @@ {'name' : "clang-x86_64-darwin13-cross-arm", 'slavenames' :["as-bldslv9"], 'builddir' :"clang-x86_64-darwin13-cross-arm", - 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, use_pty_in_tests=True, + 'factory' : ClangBuilder.getClangBuildFactory(use_pty_in_tests=True, env = { 'CC' : 'clang', 'CXX' : 'clang++', 'CXXFLAGS' : '-stdlib=libc++'}, @@ -547,7 +545,7 @@ {'name' : "clang-x86_64-darwin11-cross-linux-gnu", 'slavenames' :["as-bldslv11"], 'builddir' :"clang-x86_64-darwin11-cross-linux-gnu", - 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, use_pty_in_tests=True, + 'factory' : ClangBuilder.getClangBuildFactory(jobs=4, use_pty_in_tests=True, run_cxx_tests=True, extra_configure_args=['--build=x86_64-apple-darwin11', '--host=x86_64-apple-darwin11', @@ -573,7 +571,7 @@ {'name': "clang-x86_64-darwin11-self-mingw32", 'slavenames':["as-bldslv11"], 'builddir':"clang-x86_64-darwin11-self-mingw32", - 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, test=False, + 'factory' : ClangBuilder.getClangBuildFactory(jobs=4, test=False, env = { 'PATH' : "/mingw_build_tools/install_with_gcc/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin", 'CC' : 'clang', 'CXX' : 'clang++', Index: zorg/buildbot/builders/ClangBuilder.py =================================================================== --- zorg/buildbot/builders/ClangBuilder.py +++ zorg/buildbot/builders/ClangBuilder.py @@ -24,7 +24,6 @@ examples=False, valgrind=False, valgrindLeakCheck=False, - outOfDir=False, useTwoStage=False, completely_clean=False, make='make', @@ -55,21 +54,11 @@ # Overwrite pre-set items with the given ones, so user can set anything. merged_env.update(env) - if run_gdb or run_gcc or run_modern_gdb: - outOfDir = True - - # Don't use in-dir builds with a two stage build process. - inDir = not outOfDir and not useTwoStage - if inDir: - llvm_srcdir = "llvm" - llvm_1_objdir = "llvm" - llvm_1_installdir = None - else: - llvm_srcdir = "llvm.src" - llvm_1_objdir = "llvm.obj" - llvm_1_installdir = "llvm.install.1" - llvm_2_objdir = "llvm.obj.2" - llvm_2_installdir = "llvm.install" + llvm_srcdir = "llvm.src" + llvm_1_objdir = "llvm.obj" + llvm_1_installdir = "llvm.install.1" + llvm_2_objdir = "llvm.obj.2" + llvm_2_installdir = "llvm.install" f = buildbot.process.factory.BuildFactory() Index: zorg/buildbot/builders/LLDBBuilder.py =================================================================== --- zorg/buildbot/builders/LLDBBuilder.py +++ zorg/buildbot/builders/LLDBBuilder.py @@ -139,7 +139,6 @@ def getLLDBBuildFactory( triple, - outOfDir=False, useTwoStage=False, make='make', jobs='%(jobs)s', @@ -148,13 +147,8 @@ *args, **kwargs): - inDir = not outOfDir and not useTwoStage - if inDir: - llvm_srcdir = "llvm" - llvm_objdir = "llvm" - else: - llvm_srcdir = "llvm.src" - llvm_objdir = "llvm.obj" + llvm_srcdir = "llvm.src" + llvm_objdir = "llvm.obj" f = buildbot.process.factory.BuildFactory() Index: zorg/buildbot/builders/LLVMBuilder.py =================================================================== --- zorg/buildbot/builders/LLVMBuilder.py +++ zorg/buildbot/builders/LLVMBuilder.py @@ -29,8 +29,7 @@ llvmgccdir = None, # Path to llvm-gcc. config_name = 'Debug+Asserts', # Configuration name. env = {}, # Environmental variables for all steps. - extra_configure_args = [], # Extra args for the conigure step. - outOfDir = False): # Enable out-of-dir build (for cross-compile builds). + extra_configure_args = []): # Extra args for the conigure step. # Prepare environmental variables. Set here all env we want everywhere. merged_env = { 'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences. @@ -38,12 +37,8 @@ if env is not None: merged_env.update(env) # Overwrite pre-set items with the given ones, so user can set anything. - if outOfDir: - llvm_srcdir = "llvm.src" - llvm_objdir = "llvm.obj" - else: - llvm_srcdir = "llvm" - llvm_objdir = "llvm" + llvm_srcdir = "llvm.src" + llvm_objdir = "llvm.obj" f = buildbot.process.factory.BuildFactory() Index: zorg/buildbot/builders/LNTBuilder.py =================================================================== --- zorg/buildbot/builders/LNTBuilder.py +++ zorg/buildbot/builders/LNTBuilder.py @@ -49,7 +49,7 @@ # Build compiler to test. f = ClangBuilder.getClangBuildFactory( - triple, outOfDir=True, clean=clean, test=test, + triple, clean=clean, test=test, stage1_config='Release+Asserts', **kwargs) # Add an LNT test runner. Index: zorg/buildbot/builders/NightlytestBuilder.py =================================================================== --- zorg/buildbot/builders/NightlytestBuilder.py +++ zorg/buildbot/builders/NightlytestBuilder.py @@ -60,7 +60,7 @@ def getFastNightlyTestBuildFactory(triple, xfails=[], clean=True, test=False, make='make', **kwargs): # Build compiler to test. f = ClangBuilder.getClangBuildFactory( - triple, outOfDir=True, clean=clean, test=test, + triple, clean=clean, test=test, make=make, **kwargs) # Prepare environmental variables. Set here all env we want everywhere. Index: zorg/buildbot/builders/PollyBuilder.py =================================================================== --- zorg/buildbot/builders/PollyBuilder.py +++ zorg/buildbot/builders/PollyBuilder.py @@ -139,7 +139,7 @@ llvm_install_dir = 'llvm.install.1' f = ClangBuilder.getClangBuildFactory( - triple, outOfDir=True, clean=clean, test=test, + triple, clean=clean, test=test, stage1_config='Release+Asserts', **kwargs) f.addStep(ShellCommand(name="install-llvm-and-clang",