citrun

commit 7959454316451a9f4db256b763b88f2d346dfd99
parent 1c244c377d4f3aa18568777ee06d815fee4049f8
Author: Kyle Milz <kyle@getaddrinfo.net>
Date:   Sun, 27 Mar 2016 09:23:06 -0600

wrap: use -rpath instead of LD_LIBRARY_PATH

- this should hopefully be just as reliable with one less step to do

Diffstat:
M
SCV/Project.pm
 | 
2
+-
M
wrap/scv_wrap
 | 
6
+-----

2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/SCV/Project.pm b/SCV/Project.pm
@@ -89,7 +89,7 @@ sub run {
 	$ENV{SCV_VIEWER_SOCKET} = "SCV::Viewer.socket";
 
 	my $tmp_dir = $self->{tmp_dir};
-	$self->{pid} = open3(undef, undef, \*CHLD_ERR, "wrap/scv_wrap", "$tmp_dir/$self->{prog_name}", @args);
+	$self->{pid} = open3(undef, undef, \*CHLD_ERR, "$tmp_dir/$self->{prog_name}", @args);
 }
 
 sub kill {
diff --git a/wrap/scv_wrap b/wrap/scv_wrap
@@ -11,11 +11,7 @@ fi
 export SCV_PATH="$scv_root/instrument/compilers"
 export PATH="$SCV_PATH:$PATH"
 
-export LDFLAGS="-L$scv_root/lib"
+export LDFLAGS="-L$scv_root/lib -Wl,-rpath=$scv_root/lib"
 export LDADD="-lscv"
 
-# Used for running programs
-export LD_LIBRARY_PATH="$scv_root/lib"
-export DYLD_LIBRARY_PATH="$scv_root/lib"
-
 exec $@