Skip to content

Commit

Permalink
remove engine from llvm-config
Browse files Browse the repository at this point in the history
Due to some changes on llvm's libraries, the output
of running `llvm-config engine` doesn't include some
libs which are needed for compiling clang_delta, e.g.,
libLLVMMSP430Desc.a, libLLVMMSP430AsmPrinter.a, etc.

Fixed it by obtaining all llvm libs.
  • Loading branch information
chenyang78 committed Aug 14, 2012
1 parent 58a414b commit c34cf1e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion clang_delta/Makefile.am
Expand Up @@ -22,7 +22,7 @@ GIT_FLAG = -DGIT_VERSION=\"$(GIT_HASH)\"
LLVMCXXFLAGS := $(shell "$(LLVM_CONFIG)" --cxxflags)
LLVMLDFLAGS := $(shell "$(LLVM_CONFIG)" \--ldflags)
LLVMINCLUDEDIR := $(shell "$(LLVM_CONFIG)" --includedir)
LLVMLIBS := $(shell "$(LLVM_CONFIG)" \--libs engine)
LLVMLIBS := $(shell "$(LLVM_CONFIG)" \--libs)

clang_delta_CPPFLAGS = \
$(GIT_FLAG) \
Expand Down
2 changes: 1 addition & 1 deletion clang_delta/Makefile.in
Expand Up @@ -277,7 +277,7 @@ GIT_FLAG = -DGIT_VERSION=\"$(GIT_HASH)\"
LLVMCXXFLAGS := $(shell "$(LLVM_CONFIG)" --cxxflags)
LLVMLDFLAGS := $(shell "$(LLVM_CONFIG)" \--ldflags)
LLVMINCLUDEDIR := $(shell "$(LLVM_CONFIG)" --includedir)
LLVMLIBS := $(shell "$(LLVM_CONFIG)" \--libs engine)
LLVMLIBS := $(shell "$(LLVM_CONFIG)" \--libs)
clang_delta_CPPFLAGS = \
$(GIT_FLAG) \
-I"$(LLVMINCLUDEDIR)/clang"
Expand Down
6 changes: 3 additions & 3 deletions configure
Expand Up @@ -15598,7 +15598,7 @@ See \`config.log' for more details" "$LINENO" 5; }
LLVM_BINDIR=`$LLVM_CONFIG --bindir`
LLVM_CPPFLAGS=`$LLVM_CONFIG --cxxflags`
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
LLVM_LIBS=`$LLVM_CONFIG --libs engine`
LLVM_LIBS=`$LLVM_CONFIG --libs`

# The output of `llvm-config --ldflags' often contains library directives
# that must come *after* all the LLVM libraries on the link line: e.g.,
Expand All @@ -15615,8 +15615,8 @@ See \`config.log' for more details" "$LINENO" 5; }
LIBS="$LIBS $LLVM_LIBS $LLVM_LDFLAGS"
# LIBS="$LIBS $LLVM_LIBS" --- see comment above.

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking can compile with and link with LLVM(engine)" >&5
$as_echo_n "checking can compile with and link with LLVM(engine)... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking can compile with and link with LLVM" >&5
$as_echo_n "checking can compile with and link with LLVM... " >&6; }
if ${ax_cv_llvm+:} false; then :
$as_echo_n "(cached) " >&6
else
Expand Down

0 comments on commit c34cf1e

Please sign in to comment.