summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-02-28 16:16:51 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-02-28 16:16:51 +0000
commitfc6cc0edd6589a01f53d497e3c3e4bf8b290f7e2 (patch)
tree37982aeff94037a18a5d81da63e4ce2ed877bbe9 /configure
parent128237d0c70c45664c51fb98a9e8e0bee4cd9211 (diff)
downloadllvm-fc6cc0edd6589a01f53d497e3c3e4bf8b290f7e2.tar.gz
llvm-fc6cc0edd6589a01f53d497e3c3e4bf8b290f7e2.tar.bz2
llvm-fc6cc0edd6589a01f53d497e3c3e4bf8b290f7e2.tar.xz
With rpaths being set correctly, SHLIBPATH_VAR is not needed anymore.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202510 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 3 insertions, 8 deletions
diff --git a/configure b/configure
index 46d557df21..42362e7da0 100755
--- a/configure
+++ b/configure
@@ -790,7 +790,6 @@ HAVE_LIBZ
HUGE_VAL_SANITY
MMAP_FILE
SHLIBEXT
-SHLIBPATH_VAR
LLVM_PREFIX
LLVM_BINDIR
LLVM_DATADIR
@@ -10710,7 +10709,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10713 "configure"
+#line 10712 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22345,9 +22344,6 @@ done
SHLIBEXT=$libltdl_cv_shlibext
-SHLIBPATH_VAR=$libltdl_cv_shlibpath_var
-
-
if test "${prefix}" = "NONE" ; then
prefix="/usr/local"
fi
@@ -23556,12 +23552,12 @@ HAVE_LIBZ!$HAVE_LIBZ$ac_delim
HUGE_VAL_SANITY!$HUGE_VAL_SANITY$ac_delim
MMAP_FILE!$MMAP_FILE$ac_delim
SHLIBEXT!$SHLIBEXT$ac_delim
-SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
LLVM_PREFIX!$LLVM_PREFIX$ac_delim
LLVM_BINDIR!$LLVM_BINDIR$ac_delim
LLVM_DATADIR!$LLVM_DATADIR$ac_delim
LLVM_DOCSDIR!$LLVM_DOCSDIR$ac_delim
LLVM_ETCDIR!$LLVM_ETCDIR$ac_delim
+LLVM_INCLUDEDIR!$LLVM_INCLUDEDIR$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -23603,7 +23599,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-LLVM_INCLUDEDIR!$LLVM_INCLUDEDIR$ac_delim
LLVM_INFODIR!$LLVM_INFODIR$ac_delim
LLVM_MANDIR!$LLVM_MANDIR$ac_delim
LLVM_CONFIGTIME!$LLVM_CONFIGTIME$ac_delim
@@ -23618,7 +23613,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` = 13; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5