diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2009-03-21 18:12:24 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2009-03-21 18:12:24 +0000 |
| commit | 802cd84eb46b3fd2aa754b884debbedfbaf99e36 (patch) | |
| tree | 9544d82cecc24ac058632fba2f64209e1b950b3d /test/Makefile | |
| parent | 8c7f24a36ad7d5aa7322a64d22666fec35fb8478 (diff) | |
| download | llvm-802cd84eb46b3fd2aa754b884debbedfbaf99e36.tar.gz llvm-802cd84eb46b3fd2aa754b884debbedfbaf99e36.tar.bz2 llvm-802cd84eb46b3fd2aa754b884debbedfbaf99e36.tar.xz | |
Re-commit r67334 and r67349 with fix.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67451 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/test/Makefile b/test/Makefile index 8825c53d5b..8ba4f33541 100644 --- a/test/Makefile +++ b/test/Makefile @@ -87,6 +87,11 @@ DSYMUTIL=dsymutil else DSYMUTIL=true endif +ifdef TargetCommonOpts +BUGPOINT_TOPTS="-gcc-tool-args $(TargetCommonOpts)" +else +BUGPOINT_TOPTS="" +endif FORCE: @@ -108,12 +113,13 @@ 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) $(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 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 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 |