aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-06-11 18:52:11 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-06-11 18:52:11 +0000
commitadd4c2fbb1c5038337146a04e48d66a3d8bafa6b (patch)
tree48247d82257bab54c89b439034b1c28716198767 /configure
parent4cef3d818183aafc1b3adfad4140483d9ad1ad86 (diff)
downloadexternal_llvm-add4c2fbb1c5038337146a04e48d66a3d8bafa6b.zip
external_llvm-add4c2fbb1c5038337146a04e48d66a3d8bafa6b.tar.gz
external_llvm-add4c2fbb1c5038337146a04e48d66a3d8bafa6b.tar.bz2
Don't define LLVM_LIBDIR, it is not used anymore.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183769 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure17
1 files changed, 4 insertions, 13 deletions
diff --git a/configure b/configure
index eed06de..5c4aa0b 100755
--- a/configure
+++ b/configure
@@ -786,7 +786,6 @@ SHLIBEXT
SHLIBPATH_VAR
LLVM_PREFIX
LLVM_BINDIR
-LLVM_LIBDIR
LLVM_DATADIR
LLVM_DOCSDIR
LLVM_ETCDIR
@@ -10537,7 +10536,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10540 "configure"
+#line 10539 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22308,7 +22307,6 @@ if test "${prefix}" = "NONE" ; then
fi
eval LLVM_PREFIX="${prefix}";
eval LLVM_BINDIR="${prefix}/bin";
-eval LLVM_LIBDIR="${prefix}/lib";
eval LLVM_DATADIR="${prefix}/share/llvm";
eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
eval LLVM_ETCDIR="${prefix}/etc/llvm";
@@ -22326,7 +22324,6 @@ LLVM_CONFIGTIME=`date`
-
if test "${ENABLE_TIMESTAMPS}" = "0"; then
LLVM_CONFIGTIME="(timestamp not enabled)"
fi
@@ -22343,11 +22340,6 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
-#define LLVM_LIBDIR "$LLVM_LIBDIR"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
#define LLVM_DATADIR "$LLVM_DATADIR"
_ACEOF
@@ -22434,7 +22426,7 @@ echo "$as_me: WARNING: --enable-bindings=ocaml specified, but ocamlopt not found
else
# ocaml stdlib is outside our prefix; use libdir/ocaml
- OCAML_LIBDIR=$LLVM_LIBDIR/ocaml
+ OCAML_LIBDIR=${prefix}/lib/ocaml
fi
fi
@@ -23518,7 +23510,6 @@ SHLIBEXT!$SHLIBEXT$ac_delim
SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
LLVM_PREFIX!$LLVM_PREFIX$ac_delim
LLVM_BINDIR!$LLVM_BINDIR$ac_delim
-LLVM_LIBDIR!$LLVM_LIBDIR$ac_delim
LLVM_DATADIR!$LLVM_DATADIR$ac_delim
LLVM_DOCSDIR!$LLVM_DOCSDIR$ac_delim
LLVM_ETCDIR!$LLVM_ETCDIR$ac_delim
@@ -23528,6 +23519,7 @@ LLVM_MANDIR!$LLVM_MANDIR$ac_delim
LLVM_CONFIGTIME!$LLVM_CONFIGTIME$ac_delim
BINDINGS_TO_BUILD!$BINDINGS_TO_BUILD$ac_delim
ALL_BINDINGS!$ALL_BINDINGS$ac_delim
+OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -23569,7 +23561,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
RPATH!$RPATH$ac_delim
RDYNAMIC!$RDYNAMIC$ac_delim
@@ -23578,7 +23569,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5