Skip to content

Commit 134b61a

Browse files
ericktgraydon
authored andcommitted
Use CFG_LLVM_ROOT's llvm-config if it exists.
On some platform (OS X), llvm needs macros like __STDC_LIMIT_MACROS defined in order to work, which is normally defined in llvm-config. This patch modifies the config to use CFG_LLVM_ROOT's llvm-config if it exists, which fixes the compile failures.
1 parent b6d2fe4 commit 134b61a

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

configure

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,12 @@ then
226226
putvar CFG_BAD_VALGRIND
227227
fi
228228

229-
if [ ! -z "$CFG_LLVM_ROOT" ]
229+
if [ ! -z "$CFG_LLVM_ROOT" -a -e "$CFG_LLVM_ROOT/bin/llvm-config" ]
230+
then
231+
CFG_LLVM_CONFIG="$CFG_LLVM_ROOT/bin/llvm-config"
232+
fi
233+
234+
if [ ! -z "$CFG_LLVM_ROOT" -a -z "$CFG_LLVM_CONFIG" ]
230235
then
231236
CFG_LLVM_INCDIR="$CFG_LLVM_ROOT/include"
232237
CFG_LLVM_BINDIR="$CFG_LLVM_ROOT/bin"
@@ -247,14 +252,14 @@ then
247252
| cut -d ' ' -f 4-)
248253
elif [ ! -z "$CFG_LLVM_CONFIG" ]
249254
then
250-
CFG_LLVM_VERSION=$(llvm-config --version)
251-
CFG_LLVM_INCDIR=$(llvm-config --includedir)
252-
CFG_LLVM_BINDIR=$(llvm-config --bindir)
253-
CFG_LLVM_LIBDIR=$(llvm-config --libdir)
254-
CFG_LLVM_CXXFLAGS=$(llvm-config --cxxflags)
255-
CFG_LLVM_LDFLAGS=$(llvm-config --ldflags)
256-
CFG_LLVM_LIBS=$(llvm-config --libs)
257-
CFG_LLVM_TRIPLE=$(llvm-config --host-target)
255+
CFG_LLVM_VERSION=$($CFG_LLVM_CONFIG --version)
256+
CFG_LLVM_INCDIR=$($CFG_LLVM_CONFIG --includedir)
257+
CFG_LLVM_BINDIR=$($CFG_LLVM_CONFIG --bindir)
258+
CFG_LLVM_LIBDIR=$($CFG_LLVM_CONFIG --libdir)
259+
CFG_LLVM_CXXFLAGS=$($CFG_LLVM_CONFIG --cxxflags)
260+
CFG_LLVM_LDFLAGS=$($CFG_LLVM_CONFIG --ldflags)
261+
CFG_LLVM_LIBS=$($CFG_LLVM_CONFIG --libs)
262+
CFG_LLVM_TRIPLE=$($CFG_LLVM_CONFIG --host-target)
258263
else
259264
err "either the \"CFG_LLVM_ROOT\" environment variable must be set, or a \
260265
\"llvm-config\" script must be present"

0 commit comments

Comments
 (0)