Skip to content

Commit 7d3b7db

Browse files
committed
Set DYLD_LIBRARY_PATH so that 'make check' works without prior
'make install' on OS X. Per suggestion from Adam Witney.
1 parent a2ec3fe commit 7d3b7db

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

src/test/regress/pg_regress.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.45 2004/06/03 00:25:47 momjian Exp $
2+
# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.46 2004/08/10 22:24:06 tgl Exp $
33

44
me=`basename $0`
55
: ${TMPDIR=/tmp}
@@ -328,8 +328,9 @@ then
328328

329329
# ----------
330330
# Set up shared library paths, needed by psql and pg_encoding
331-
# (if you run multibyte). LD_LIBRARY_PATH covers many platforms,
332-
# feel free to account for others as well.
331+
# (if you run multibyte). LD_LIBRARY_PATH covers many platforms.
332+
# DYLD_LIBRARY_PATH works on Darwin, and maybe other Mach-based systems.
333+
# Feel free to account for others as well.
333334
# ----------
334335

335336
if [ -n "$LD_LIBRARY_PATH" ]; then
@@ -339,6 +340,13 @@ then
339340
fi
340341
export LD_LIBRARY_PATH
341342

343+
if [ -n "$DYLD_LIBRARY_PATH" ]; then
344+
DYLD_LIBRARY_PATH="$libdir:$DYLD_LIBRARY_PATH"
345+
else
346+
DYLD_LIBRARY_PATH=$libdir
347+
fi
348+
export DYLD_LIBRARY_PATH
349+
342350
# ----------
343351
# Windows needs shared libraries in PATH. (Only those linked into
344352
# executables, not dlopen'ed ones)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy