diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2009-03-20 07:56:31 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2009-03-20 07:56:31 +0000 |
| commit | faf880fd5deb22c3feb146d0348a74e145f20419 (patch) | |
| tree | 79e0370e10bb476b9665115dec695cfddf4d1f56 /test/Makefile | |
| parent | 8fc2d0ee8dd4e077ee90a1fcc36fd0101c2947a2 (diff) | |
| download | llvm-faf880fd5deb22c3feb146d0348a74e145f20419.tar.gz llvm-faf880fd5deb22c3feb146d0348a74e145f20419.tar.bz2 llvm-faf880fd5deb22c3feb146d0348a74e145f20419.tar.xz | |
Revert r67334 and r37349 which break "make check" on Linux.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67368 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/test/Makefile b/test/Makefile index 583e2757d2..8825c53d5b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -87,9 +87,6 @@ DSYMUTIL=dsymutil else DSYMUTIL=true endif -ifeq ($(OS),Darwin) -BUGPOINT_TOPTS="-gcc-tool-args $(TargetCommonOpts)" -endif FORCE: @@ -111,13 +108,12 @@ site.exp: FORCE @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 '"' >> 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 compile_c "' $(CC) $(CPP.Flags) $(CompileCommonOpts) -c '"' >>site.tmp + @echo 'set compile_cxx "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) -c '"' >> site.tmp + @echo 'set link "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags) '"' >>site.tmp + @echo 'set llvmgcc "$(LLVMGCC) $(EXTRA_OPTIONS)"' >> site.tmp + @echo 'set llvmgxx "$(LLVMGCC) $(EXTRA_OPTIONS)"' >> site.tmp @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp - @echo 'set bugpoint_topts $(BUGPOINT_TOPTS)' >> site.tmp @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp @echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp @echo 'set valgrind "$(VALGRIND)"' >> site.tmp |