From 5af7e089f79174e576529a742c380cf418510771 Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig Date: Fri, 17 Feb 2012 14:34:25 +0100 Subject: [PATCH] Don't use -rpath-link when building on Mac. The logic here was wrong: test if the target linker supports -rpath-link, and then set it for both host and target via mkspecs/qmodule.pri. Change-Id: Ie4da7ed2e06e784f9edb65a27290913ab838a8c2 Reviewed-by: Thiago Macieira Reviewed-by: Oswald Buddenhagen --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index d33e2489a7..0687bd5021 100755 --- a/configure +++ b/configure @@ -7355,7 +7355,7 @@ QTMODULE="$outpath/mkspecs/qmodule.pri" echo "CONFIG += create_prl link_prl" >> "$QTMODULE.tmp" # Ensure we can link to uninistalled libraries -if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then +if [ "$BUILD_ON_MAC" != "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$QTMODULE.tmp" fi if [ -n "$QT_CFLAGS_PSQL" ]; then