diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-02-28 16:16:51 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-02-28 16:16:51 +0000 |
| commit | fc6cc0edd6589a01f53d497e3c3e4bf8b290f7e2 (patch) | |
| tree | 37982aeff94037a18a5d81da63e4ce2ed877bbe9 /projects | |
| parent | 128237d0c70c45664c51fb98a9e8e0bee4cd9211 (diff) | |
| download | llvm-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 'projects')
| -rw-r--r-- | projects/sample/Makefile.llvm.config.in | 3 | ||||
| -rw-r--r-- | projects/sample/autoconf/configure.ac | 4 | ||||
| -rwxr-xr-x | projects/sample/configure | 9 |
3 files changed, 2 insertions, 14 deletions
diff --git a/projects/sample/Makefile.llvm.config.in b/projects/sample/Makefile.llvm.config.in index c7df998b26..c448421f31 100644 --- a/projects/sample/Makefile.llvm.config.in +++ b/projects/sample/Makefile.llvm.config.in @@ -262,9 +262,6 @@ ENABLE_TIMESTAMPS := @ENABLE_TIMESTAMPS@ # Enable JIT for this platform TARGET_HAS_JIT = @TARGET_HAS_JIT@ -# Environment variable to set to change the runtime shared library search path. -SHLIBPATH_VAR = @SHLIBPATH_VAR@ - # Shared library extension for host platform. SHLIBEXT = @SHLIBEXT@ diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index 03cd214f66..6bbc17e259 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -1401,10 +1401,6 @@ dnl Propagate the shared library extension that the libltdl checks did to dnl the Makefiles so we can use it there too AC_SUBST(SHLIBEXT,$libltdl_cv_shlibext) -dnl Propagate the run-time library path variable that the libltdl -dnl checks found to the Makefiles so we can use it there too -AC_SUBST(SHLIBPATH_VAR,$libltdl_cv_shlibpath_var) - # Translate the various configuration directories and other basic # information into substitutions that will end up in Makefile.config.in # that these configured values can be used by the makefiles diff --git a/projects/sample/configure b/projects/sample/configure index bc04c9628d..d381223ce0 100755 --- a/projects/sample/configure +++ b/projects/sample/configure @@ -771,7 +771,6 @@ HAVE_LIBZ HUGE_VAL_SANITY MMAP_FILE SHLIBEXT -SHLIBPATH_VAR LLVM_PREFIX LLVM_BINDIR LLVM_DATADIR @@ -10383,7 +10382,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10386 "configure" +#line 10385 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -21265,9 +21264,6 @@ done SHLIBEXT=$libltdl_cv_shlibext -SHLIBPATH_VAR=$libltdl_cv_shlibpath_var - - # Translate the various configuration directories and other basic # information into substitutions that will end up in Makefile.config.in # that these configured values can be used by the makefiles @@ -22392,7 +22388,6 @@ 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 @@ -22412,7 +22407,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` = 92; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |