diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2009-03-19 20:27:23 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2009-03-19 20:27:23 +0000 |
| commit | 817046e1f1945ce2e3aaf6239e849d5ad3112d26 (patch) | |
| tree | b39c281191c120a1970497413f9bc5b65daba18a /test/Makefile | |
| parent | 8be1ac213b20c5f4f6126d6ef955a9997f150ead (diff) | |
| download | llvm-817046e1f1945ce2e3aaf6239e849d5ad3112d26.tar.gz llvm-817046e1f1945ce2e3aaf6239e849d5ad3112d26.tar.bz2 llvm-817046e1f1945ce2e3aaf6239e849d5ad3112d26.tar.xz | |
More makefile changes to allow dejagnu tests to pass when system tools default to a different target from the llvm configuration (e.g. 64-bit gcc and 32-bit llvm).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67334 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/test/Makefile b/test/Makefile index 8825c53d5b..583e2757d2 100644 --- a/test/Makefile +++ b/test/Makefile @@ -87,6 +87,9 @@ DSYMUTIL=dsymutil else DSYMUTIL=true endif +ifeq ($(OS),Darwin) +BUGPOINT_TOPTS="-gcc-tool-args $(TargetCommonOpts)" +endif FORCE: @@ -108,12 +111,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 |