diff options
| author | Bill Wendling <isanbard@gmail.com> | 2009-04-18 21:45:27 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2009-04-18 21:45:27 +0000 |
| commit | 5a22d6a6a09bd58b77b2e3ace8bc8ef459de9dad (patch) | |
| tree | e00ea8f3a2f20397c11d8b99d5b4459d1f1353b4 | |
| parent | fed844de6b33125f13666b2d5c4ba822c69a0b6d (diff) | |
| download | external_llvm-5a22d6a6a09bd58b77b2e3ace8bc8ef459de9dad.zip external_llvm-5a22d6a6a09bd58b77b2e3ace8bc8ef459de9dad.tar.gz external_llvm-5a22d6a6a09bd58b77b2e3ace8bc8ef459de9dad.tar.bz2 | |
Revert 69474 and 69475. They are causing failures during a bootstrap on Darwin.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69478 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | autoconf/configure.ac | 3 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | tools/llvmc/plugins/Base/Base.td (renamed from tools/llvmc/plugins/Base/Base.td.in) | 14 |
3 files changed, 7 insertions, 14 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 1a35514..a559689 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1065,9 +1065,6 @@ AC_CONFIG_FILES([llvm.spec]) dnl Configure doxygen's configuration file AC_CONFIG_FILES([docs/doxygen.cfg]) -dnl Configure llvmc's Base plugin -AC_CONFIG_FILES([tools/llvmc/plugins/Base/Base.td]) - dnl Do the first stage of configuration for llvm-config.in. AC_CONFIG_FILES([tools/llvm-config/llvm-config.in]) @@ -34003,9 +34003,6 @@ ac_config_files="$ac_config_files llvm.spec" ac_config_files="$ac_config_files docs/doxygen.cfg" -ac_config_files="$ac_config_files tools/llvmc/plugins/Base/Base.td" - - ac_config_files="$ac_config_files tools/llvm-config/llvm-config.in" @@ -34620,7 +34617,6 @@ do "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;; "llvm.spec") CONFIG_FILES="$CONFIG_FILES llvm.spec" ;; "docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;; - "tools/llvmc/plugins/Base/Base.td") CONFIG_FILES="$CONFIG_FILES tools/llvmc/plugins/Base/Base.td" ;; "tools/llvm-config/llvm-config.in") CONFIG_FILES="$CONFIG_FILES tools/llvm-config/llvm-config.in" ;; "setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;; "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; 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 |