From 184fde7bb0ae4812381c784c4a104b762a21f34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pekka=20J=C3=A4=C3=A4skel=C3=A4inen?= Date: Sun, 1 Nov 2020 12:59:05 +0200 Subject: [PATCH] Revert "Fix #91 by patching the produced ltmain.sh." This reverts commit 820fe4475f65b38f4ec6c7013d1ddfe4510058c0. The fix breaks build dir execution when an libtce.so is installed in LD_LIBRARY_PATH. Use LD_PRELOAD of the TCE-patched libLLVM.so as the workaround for the 'system LLVM found first' issue. --- tce/autogen.sh | 2 -- tce/ltmain.sh.patch | 19 ------------------- 2 files changed, 21 deletions(-) delete mode 100644 tce/ltmain.sh.patch diff --git a/tce/autogen.sh b/tce/autogen.sh index a196fd52c4..5bce9bab38 100755 --- a/tce/autogen.sh +++ b/tce/autogen.sh @@ -1552,8 +1552,6 @@ if [ "x$config" = "x" ] ; then $VERBOSE_ECHO "Could not locate the configure template (from `pwd`)" fi -patch -p0 < ltmain.sh.patch || true - # summarize $ECHO "done" $ECHO diff --git a/tce/ltmain.sh.patch b/tce/ltmain.sh.patch deleted file mode 100644 index cd71b9df11..0000000000 --- a/tce/ltmain.sh.patch +++ /dev/null @@ -1,19 +0,0 @@ -At least Ubuntu 18.04's libtoolize generates wrapper -scripts which _prepend_ the system path to the LD_LIBRARY_PATH, -causing the system's libllvm to be found before the user's -own installed LLVM (overridden using LB_LIBRARY_PATH). - -This patches it such that the path is appended to the path -instead. - ---- ltmain.sh.orig 2019-07-13 12:06:11.050523601 +0300 -+++ ltmain.sh 2019-07-13 12:06:46.427026644 +0300 -@@ -5479,7 +5479,7 @@ - if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var -- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" -+ $shlibpath_var=\"\$$shlibpath_var:$temp_rpath\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed