summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2015-03-31 16:44:42 -0400
committerEric S. Raymond <esr@thyrsus.com>2015-03-31 16:44:42 -0400
commitf1c0214a07588adaa304fd76801b11c100613fdb (patch)
treefd3c4b4e58b1ec303cc500c7a995868fa5f83bb0
parent607790555ddb0f92ca7286e92f600468bd25b341 (diff)
downloadgpsd-f1c0214a07588adaa304fd76801b11c100613fdb.tar.gz
No more need for fragile setting ogf LD_LIBRARY_PATH.
All regression tests pass.
-rw-r--r--SConstruct1
-rwxr-xr-xregress-driver4
2 files changed, 0 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct
index 1cbff0c1..661f14c7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -226,7 +226,6 @@ for var in import_env:
if var in os.environ:
envs[var] = os.environ[var]
envs["GPSD_HOME"] = os.getcwd()
-envs["LD_LIBRARY_PATH"] = os.getcwd()
env = Environment(tools=["default", "tar", "textfile"], options=opts, ENV=envs)
opts.Save('.scons-option-cache', env)
diff --git a/regress-driver b/regress-driver
index f6f3c96a..62be4981 100755
--- a/regress-driver
+++ b/regress-driver
@@ -14,10 +14,6 @@ else
GPSD_HOME=`dirname $0`
fi
-# Avoid dynamic-linking failures if we don't happen to have the GPSD
-# libraries installed in system space yet.
-export LD_LIBRARY_PATH=$GPSD_HOME
-
# Arrange to call a gpsfake in the source directory without fuss.
if [ -z ${PYTHON} ]; then
PYTHON="python"