EngineBuilder: support for custom TargetOptions. Fixes the

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 4e34e7222e58fba73aa4de197ed9005801515d05..1bf287401c104d589a907ae41e75b0bdc2aaa73b 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -59,7 +59,7 @@ extra-lit-site-cfgs::
 
 ifneq ($(strip $(filter check-local-all,$(MAKECMDGOALS))),)
 ifndef TESTSUITE
-ifeq ($(shell test -d $(PROJ_SRC_DIR)/../tools/clang && echo OK), OK)
+ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/clang/Makefile && echo OK), OK)
 LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/test
 
 # Force creation of Clang's lit.site.cfg.
@@ -121,11 +121,6 @@ DSYMUTIL=dsymutil
 else
 DSYMUTIL=true
 endif
-ifdef TargetCommonOpts
-BUGPOINT_TOPTS="-gcc-tool-args $(TargetCommonOpts)"
-else
-BUGPOINT_TOPTS=""
-endif
 
 ifneq ($(OCAMLOPT),)
 CC_FOR_OCAMLOPT := $(shell $(OCAMLOPT) -config | grep native_c_compiler | sed -e 's/native_c_compiler: //')
@@ -140,30 +135,18 @@ site.exp: FORCE
        @echo '# Do not edit!' >> site.tmp
        @echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp
        @echo 'set TARGETS_TO_BUILD "$(TARGETS_TO_BUILD)"' >> site.tmp
-       @echo 'set llvmgcc_langs "$(LLVMGCC_LANGS)"' >> site.tmp
-       @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
-       @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
        @echo 'set llvmshlibdir "$(SharedLibDir)"' >>site.tmp
        @echo 'set llvm_bindings "$(BINDINGS_TO_BUILD)"' >> site.tmp
        @echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp
        @echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp
        @echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp
        @echo 'set objdir "$(LLVM_OBJ_ROOT)/test"' >>site.tmp
-       @echo 'set gccpath "$(CC)"' >>site.tmp
-       @echo 'set gxxpath "$(CXX)"' >>site.tmp
-       @echo 'set compile_c "' $(CC) $(CPP.Flags) $(TargetCommonOpts) $(CompileCommonOpts) -c '"' >>site.tmp
-       @echo 'set compile_cxx "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) -c -x c++ '"' >> site.tmp
        @echo 'set link "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) '"' >>site.tmp
-       @echo 'set llvmgcc "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp
-       @echo 'set llvmgxx "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp
-       @echo 'set bugpoint_topts $(BUGPOINT_TOPTS)' >> site.tmp
        @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp
        @echo 'set ocamlopt "$(OCAMLOPT) -cc \"$(CXX_FOR_OCAMLOPT)\" -I $(LibDir)/ocaml"' >> site.tmp
        @echo 'set valgrind "$(VALGRIND)"' >> site.tmp
        @echo 'set grep "$(GREP)"' >>site.tmp
        @echo 'set gas "$(GAS)"' >>site.tmp
-       @echo 'set llvmdsymutil "$(DSYMUTIL)"' >>site.tmp
-       @echo 'set emitir "$(LLVMCC_EMITIR_FLAG)"' >>site.tmp
        @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
        @test ! -f site.exp || \
        sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
@@ -185,7 +168,7 @@ lit.site.cfg: site.exp
        @$(ECHOPATH) s=@LLVMGCCDIR@=$(LLVMGCCDIR)=g >> lit.tmp
        @$(ECHOPATH) s=@PYTHON_EXECUTABLE@=python=g >> lit.tmp
        @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp
-       @$(ECHOPATH) s=@LLVM_ENABLE_ASSERTIONS@=$(ENABLE_ASSERTIONS)=g >> lit.tmp
+       @$(ECHOPATH) s=@ENABLE_ASSERTIONS@=$(ENABLE_ASSERTIONS)=g >> lit.tmp
        @sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
        @-rm -f lit.tmp