summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-08-21 18:27:39 +0200
committerThiago Macieira <thiago.macieira@nokia.com>2009-08-21 18:28:00 +0200
commit084a32add3ae8f2976ff0c164b49170484a34bc4 (patch)
tree54ce0a552f09e49b567cff45c73c7c3f6d5bbbb7 /configure
parentd9b59b66642100689d135f387e2de14c54f182ec (diff)
Don't try to use -rpath to support link-time library searching.
This is breaking the MacOS X build because -rpath is a supported option, but it conflicts with others (namely -mmacosx-version-min=10.4). So it's causing the Mac build to fail.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 0 insertions, 2 deletions
diff --git a/configure b/configure
index 48a0202140..97edc56c8b 100755
--- a/configure
+++ b/configure
@@ -7039,8 +7039,6 @@ EOF
# Ensure we can link to uninistalled libraries
if linkerSupportsFlag -rpath-link "$outpath/lib"; then
echo "QMAKE_LFLAGS += -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib" >> "$CACHEFILE.tmp"
-elif linkerSupportsFlag -rpath "$outpath/lib"; then
- echo "QMAKE_LFLAGS += -Wl,-rpath,\$\$QT_BUILD_TREE/lib" >> "$CACHEFILE.tmp"
fi
if [ -n "$QT_CFLAGS_PSQL" ]; then