aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2009-04-18 11:20:33 +0000
committerBill Wendling <isanbard@gmail.com>2009-04-18 11:20:33 +0000
commitebcceeeabad733339466334be5b96b28e7d0d398 (patch)
treef46920dd16a68f7ec4a67dd0611adc0af56b5c4a /tools
parente850146fb22347474f6d8693c48f79d19d3178a4 (diff)
downloadexternal_llvm-ebcceeeabad733339466334be5b96b28e7d0d398.zip
external_llvm-ebcceeeabad733339466334be5b96b28e7d0d398.tar.gz
external_llvm-ebcceeeabad733339466334be5b96b28e7d0d398.tar.bz2
Temporarily revert r69438 and r69439. These were causing failures during a
release build of llvm. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69440 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r--tools/llvmc/plugins/Base/Base.td (renamed from tools/llvmc/plugins/Base/Base.td.in)14
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/llvmc/plugins/Base/Base.td.in b/tools/llvmc/plugins/Base/Base.td
index 4ea6ee1..ec6f87c 100644
--- a/tools/llvmc/plugins/Base/Base.td.in
+++ b/tools/llvmc/plugins/Base/Base.td
@@ -80,10 +80,10 @@ class llvm_gcc_based <string cmd_prefix, string in_lang, string E_ext> : Tool<
(sink)
]>;
-def llvm_gcc_c : llvm_gcc_based<"@LLVMGCC@ -x c", "c", "i">;
-def llvm_gcc_cpp : llvm_gcc_based<"@LLVMGXX@ -x c++", "c++", "i">;
-def llvm_gcc_m : llvm_gcc_based<"@LLVMGCC@ -x objective-c", "objective-c", "mi">;
-def llvm_gcc_mxx : llvm_gcc_based<"@LLVMGCC@ -x objective-c++",
+def llvm_gcc_c : llvm_gcc_based<"llvm-gcc -x c", "c", "i">;
+def llvm_gcc_cpp : llvm_gcc_based<"llvm-g++ -x c++", "c++", "i">;
+def llvm_gcc_m : llvm_gcc_based<"llvm-gcc -x objective-c", "objective-c", "mi">;
+def llvm_gcc_mxx : llvm_gcc_based<"llvm-gcc -x objective-c++",
"objective-c++", "mi">;
def opt : Tool<
@@ -105,7 +105,7 @@ def llvm_gcc_assembler : Tool<
[(in_language "assembler"),
(out_language "object-code"),
(output_suffix "o"),
- (cmd_line "@LLVMGCC@ -c -x assembler $INFILE -o $OUTFILE"),
+ (cmd_line "llvm-gcc -c -x assembler $INFILE -o $OUTFILE"),
(actions (case
(switch_on "c"), (stop_compilation),
(not_empty "Wa,"), (unpack_values "Wa,")))
@@ -136,9 +136,9 @@ class llvm_gcc_based_linker <string cmd_prefix> : Tool<
]>;
// Default linker
-def llvm_gcc_linker : llvm_gcc_based_linker<"@LLVMGCC@">;
+def llvm_gcc_linker : llvm_gcc_based_linker<"llvm-gcc">;
// Alternative linker for C++
-def llvm_gcc_cpp_linker : llvm_gcc_based_linker<"@LLVMGXX@">;
+def llvm_gcc_cpp_linker : llvm_gcc_based_linker<"llvm-g++">;
// Language map