diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index a55968956bae..1a355149dbd8 100644
--- a/llvm/autoconf/configure.ac
+++ b/llvm/autoconf/configure.ac
@@ -1065,6 +1065,9 @@ 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])
 
diff --git a/llvm/tools/llvmc/plugins/Base/Base.td b/llvm/tools/llvmc/plugins/Base/Base.td.in
similarity index 93%
rename from llvm/tools/llvmc/plugins/Base/Base.td
rename to llvm/tools/llvmc/plugins/Base/Base.td.in
index ec6f87cfc7cb..4ea6ee1d1058 100644
--- a/llvm/tools/llvmc/plugins/Base/Base.td
+++ b/llvm/tools/llvmc/plugins/Base/Base.td.in
@@ -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<"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++",
+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++",
                                   "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 "llvm-gcc -c -x assembler $INFILE -o $OUTFILE"),
+ (cmd_line "@LLVMGCC@ -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<"llvm-gcc">;
+def llvm_gcc_linker : llvm_gcc_based_linker<"@LLVMGCC@">;
 // Alternative linker for C++
-def llvm_gcc_cpp_linker : llvm_gcc_based_linker<"llvm-g++">;
+def llvm_gcc_cpp_linker : llvm_gcc_based_linker<"@LLVMGXX@">;
 
 // Language map