Commit 7d3b7db8 authored by Tom Lane's avatar Tom Lane

Set DYLD_LIBRARY_PATH so that 'make check' works without prior

'make install' on OS X.  Per suggestion from Adam Witney.
parent a2ec3fe8
#! /bin/sh #! /bin/sh
# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.45 2004/06/03 00:25:47 momjian Exp $ # $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.46 2004/08/10 22:24:06 tgl Exp $
me=`basename $0` me=`basename $0`
: ${TMPDIR=/tmp} : ${TMPDIR=/tmp}
...@@ -328,8 +328,9 @@ then ...@@ -328,8 +328,9 @@ then
# ---------- # ----------
# Set up shared library paths, needed by psql and pg_encoding # Set up shared library paths, needed by psql and pg_encoding
# (if you run multibyte). LD_LIBRARY_PATH covers many platforms, # (if you run multibyte). LD_LIBRARY_PATH covers many platforms.
# feel free to account for others as well. # DYLD_LIBRARY_PATH works on Darwin, and maybe other Mach-based systems.
# Feel free to account for others as well.
# ---------- # ----------
if [ -n "$LD_LIBRARY_PATH" ]; then if [ -n "$LD_LIBRARY_PATH" ]; then
...@@ -339,6 +340,13 @@ then ...@@ -339,6 +340,13 @@ then
fi fi
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
if [ -n "$DYLD_LIBRARY_PATH" ]; then
DYLD_LIBRARY_PATH="$libdir:$DYLD_LIBRARY_PATH"
else
DYLD_LIBRARY_PATH=$libdir
fi
export DYLD_LIBRARY_PATH
# ---------- # ----------
# Windows needs shared libraries in PATH. (Only those linked into # Windows needs shared libraries in PATH. (Only those linked into
# executables, not dlopen'ed ones) # executables, not dlopen'ed ones)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment