Skip to content
Snippets Groups Projects
Commit a8b49564 authored by Virgile Prevosto's avatar Virgile Prevosto
Browse files

[Makefile] fix link directive in static mode

parent 6fa36b45
No related branches found
No related tags found
No related merge requests found
...@@ -76,21 +76,13 @@ LLVM_MAJOR:= $(shell echo $(LLVM_VERSION) | sed -e 's/^\([0-9]*\).*/\1/') ...@@ -76,21 +76,13 @@ LLVM_MAJOR:= $(shell echo $(LLVM_VERSION) | sed -e 's/^\([0-9]*\).*/\1/')
LLVM_MAJOR_10:= \ LLVM_MAJOR_10:= \
$(shell if test $(LLVM_MAJOR) -ge 10; then echo "yes"; else echo "no"; fi) $(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 # for use in main Makefile
default: $(PLUGIN_DIR)/bin/$(TOOLNAME) default: $(PLUGIN_DIR)/bin/$(TOOLNAME)
$(PLUGIN_DIR)/bin/$(TOOLNAME): $(OBJS) $(PLUGIN_DIR)/bin $(PLUGIN_DIR)/bin/$(TOOLNAME): $(OBJS) $(PLUGIN_DIR)/bin
$(PRINT_LINKING) $@ $(PRINT_LINKING) $@
$(CXX) $(CLANG_LINKFLAGS) -o $@ \ $(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: $(PLUGIN_DIR)/bin:
$(MKDIR) $@ $(MKDIR) $@
......
...@@ -30,6 +30,7 @@ CLANG_LINKFLAGS=@CLANG_LINKFLAGS@ ...@@ -30,6 +30,7 @@ CLANG_LINKFLAGS=@CLANG_LINKFLAGS@
CLANG_SYSLIBS=@CLANG_SYSLIBS@ CLANG_SYSLIBS=@CLANG_SYSLIBS@
CLANG_BIN_DIR=@CLANG_BIN_DIR@ CLANG_BIN_DIR=@CLANG_BIN_DIR@
LLVM_LIBS=@LLVM_LIBS@ LLVM_LIBS=@LLVM_LIBS@
CLANG_LIBS=@CLANG_LIBS@
LLVM_VERSION=@LLVM_VERSION@ LLVM_VERSION=@LLVM_VERSION@
DEFAULT_FC_C_HEADERS=@DEFAULT_FC_C_HEADERS@ DEFAULT_FC_C_HEADERS=@DEFAULT_FC_C_HEADERS@
DEFAULT_FC_CXX_HEADERS=@DEFAULT_FC_CXX_HEADERS@ DEFAULT_FC_CXX_HEADERS=@DEFAULT_FC_CXX_HEADERS@
......
...@@ -54,6 +54,7 @@ AC_SUBST(CLANG_LINKFLAGS) ...@@ -54,6 +54,7 @@ AC_SUBST(CLANG_LINKFLAGS)
AC_SUBST(CLANG_SYSLIBS) AC_SUBST(CLANG_SYSLIBS)
AC_SUBST(CLANG_BIN_DIR) AC_SUBST(CLANG_BIN_DIR)
AC_SUBST(LLVM_LIBS) AC_SUBST(LLVM_LIBS)
AC_SUBST(CLANG_LIBS)
AC_SUBST(LLVM_VERSION) AC_SUBST(LLVM_VERSION)
AC_SUBST(DEFAULT_FC_C_HEADERS) AC_SUBST(DEFAULT_FC_C_HEADERS)
AC_SUBST(DEFAULT_FC_CXX_HEADERS) AC_SUBST(DEFAULT_FC_CXX_HEADERS)
...@@ -108,8 +109,11 @@ CLANG_SYSLIBS="$($LLVM_CONFIG --system-libs)" ...@@ -108,8 +109,11 @@ CLANG_SYSLIBS="$($LLVM_CONFIG --system-libs)"
CLANG_BIN_DIR="$($LLVM_CONFIG --bindir)" CLANG_BIN_DIR="$($LLVM_CONFIG --bindir)"
if test "$LLVM_SHARED_MODE" = "shared"; then if test "$LLVM_SHARED_MODE" = "shared"; then
LLVM_LIBS=$($LLVM_CONFIG --libs core); LLVM_LIBS=$($LLVM_CONFIG --libs core);
CLANG_LIBS=clang-cpp
else else
LLVM_LIBS=$($LLVM_CONFIG --libs profiledata asmparser mc mcparser support bitreader option); 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
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment