Merging r261365:

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 9da22b20417e33eed2379dde0105d5e5afce95e4..03194520caa259b94c1d84ff5a6acd0666365a48 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -129,10 +129,12 @@ lit.site.cfg: FORCE
        @$(ECHOPATH) s=@EXEEXT@=$(EXEEXT)=g >> lit.tmp
        @$(ECHOPATH) s=@PYTHON_EXECUTABLE@=$(PYTHON)=g >> lit.tmp
        @$(ECHOPATH) s=@GOLD_EXECUTABLE@=ld=g >> lit.tmp
+       @$(ECHOPATH) s=@LD64_EXECUTABLE@=ld=g >> lit.tmp
        @$(ECHOPATH) s=@OCAMLFIND@=$(OCAMLFIND)=g >> lit.tmp
        @$(ECHOPATH) s!@OCAMLFLAGS@!$(addprefix -cclib ,$(LDFLAGS))!g >> lit.tmp
        @$(ECHOPATH) s=@HAVE_OCAMLOPT@=$(HAVE_OCAMLOPT)=g >> lit.tmp
        @$(ECHOPATH) s=@HAVE_OCAML_OUNIT@=$(HAVE_OCAML_OUNIT)=g >> lit.tmp
+       @$(ECHOPATH) s=@LLVM_INCLUDE_GO_TESTS@=ON=g >> lit.tmp
        @$(ECHOPATH) s=@GO_EXECUTABLE@=$(GO)=g >> lit.tmp
        @$(ECHOPATH) s!@HOST_CC@!$(CC)!g >> lit.tmp
        @$(ECHOPATH) s!@HOST_CXX@!$(CXX)!g >> lit.tmp
@@ -144,6 +146,9 @@ lit.site.cfg: FORCE
        @$(ECHOPATH) s=@HOST_OS@=$(HOST_OS)=g >> lit.tmp
        @$(ECHOPATH) s=@HOST_ARCH@=$(HOST_ARCH)=g >> lit.tmp
        @$(ECHOPATH) s=@HAVE_LIBZ@=$(HAVE_LIBZ)=g >> lit.tmp
+       @$(ECHOPATH) s=@HAVE_DIA_SDK@=0=g >> lit.tmp
+       @$(ECHOPATH) s=@ENABLE_EXAMPLES@=$(BUILD_EXAMPLES)=g >> lit.tmp
+       @$(ECHOPATH) s=@ENABLE_TIMESTAMPS@=$(ENABLE_TIMESTAMPS)=g >> lit.tmp
        @sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
        @-rm -f lit.tmp