diff --git a/Makefile.clang b/Makefile.clang
index 0ed0ef99381bf7cec58b69b9057a0afb1e937bda..b06b99fe23eee1d5c32f3a47f0f2202ce32074e9 100644
--- a/Makefile.clang
+++ b/Makefile.clang
@@ -76,21 +76,13 @@ LLVM_MAJOR:= $(shell echo $(LLVM_VERSION) | sed -e 's/^\([0-9]*\).*/\1/')
 LLVM_MAJOR_10:= \
   $(shell if test $(LLVM_MAJOR) -ge 10; then echo "yes"; else echo "no"; fi)
 
-#LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc
-ifeq ("$(LLVM_MAJOR_10)","yes")
-USEDLIBS=clang-cpp
-else
-USEDLIBS = clangFrontend clangDriver clangParse clangSema clangAnalysis \
-           clangEdit clangAST clangLex clangSerialization clangBasic
-endif
-
 # for use in main Makefile
 default: $(PLUGIN_DIR)/bin/$(TOOLNAME)
 
 $(PLUGIN_DIR)/bin/$(TOOLNAME): $(OBJS) $(PLUGIN_DIR)/bin
 	$(PRINT_LINKING) $@
 	$(CXX) $(CLANG_LINKFLAGS) -o $@  \
-               $(OBJS) $(addprefix -l,$(USEDLIBS)) $(LLVM_LIBS) $(CLANG_SYSLIBS) $(CLANG_LINKFLAGS)
+               $(OBJS) $(addprefix -l,$(CLANG_LIBS)) $(LLVM_LIBS) $(CLANG_SYSLIBS) $(CLANG_LINKFLAGS)
 
 $(PLUGIN_DIR)/bin:
 	$(MKDIR) $@
diff --git a/Makefile.config.in b/Makefile.config.in
index ca946f8eaa7c4724dc47e5774c8fd5f319bccbce..cd5828fe58d6fa9d66d7811bf901829d69f3ef97 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -30,6 +30,7 @@ CLANG_LINKFLAGS=@CLANG_LINKFLAGS@
 CLANG_SYSLIBS=@CLANG_SYSLIBS@
 CLANG_BIN_DIR=@CLANG_BIN_DIR@
 LLVM_LIBS=@LLVM_LIBS@
+CLANG_LIBS=@CLANG_LIBS@
 LLVM_VERSION=@LLVM_VERSION@
 DEFAULT_FC_C_HEADERS=@DEFAULT_FC_C_HEADERS@
 DEFAULT_FC_CXX_HEADERS=@DEFAULT_FC_CXX_HEADERS@
diff --git a/configure.ac b/configure.ac
index 6b53effa2a431c589b968fa530436d5b15aaca5f..78c906453d2ad7114615de28724be1ea20199924 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,7 @@ AC_SUBST(CLANG_LINKFLAGS)
 AC_SUBST(CLANG_SYSLIBS)
 AC_SUBST(CLANG_BIN_DIR)
 AC_SUBST(LLVM_LIBS)
+AC_SUBST(CLANG_LIBS)
 AC_SUBST(LLVM_VERSION)
 AC_SUBST(DEFAULT_FC_C_HEADERS)
 AC_SUBST(DEFAULT_FC_CXX_HEADERS)
@@ -108,8 +109,11 @@ CLANG_SYSLIBS="$($LLVM_CONFIG --system-libs)"
 CLANG_BIN_DIR="$($LLVM_CONFIG --bindir)"
 if test "$LLVM_SHARED_MODE" = "shared"; then
 LLVM_LIBS=$($LLVM_CONFIG --libs core);
+CLANG_LIBS=clang-cpp
 else
 LLVM_LIBS=$($LLVM_CONFIG --libs profiledata asmparser mc mcparser support bitreader option);
+CLANG_LIBS=clangFrontend clangDriver clangParse clangSema clangAnalysis \
+           clangEdit clangAST clangLex clangSerialization clangBasic
 fi
 fi