diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-21 16:27:39 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-21 16:28:00 (GMT) |
commit | 084a32add3ae8f2976ff0c164b49170484a34bc4 (patch) | |
tree | 54ce0a552f09e49b567cff45c73c7c3f6d5bbbb7 /configure | |
parent | d9b59b66642100689d135f387e2de14c54f182ec (diff) | |
download | Qt-084a32add3ae8f2976ff0c164b49170484a34bc4.zip Qt-084a32add3ae8f2976ff0c164b49170484a34bc4.tar.gz Qt-084a32add3ae8f2976ff0c164b49170484a34bc4.tar.bz2 |
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-x | configure | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -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 |