summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-01-26 11:27:37 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-01-26 11:27:37 +0000
commit0a1af55a9b69f7fd58dbce43a0d4c1faf0143838 (patch)
tree26da168e740734d168be37803abec2f8739b213d /configure
parentb8fb0ee999d32401157be8d86e5a03185aadbb9e (diff)
parent158a3a4159bdc5a49caecd63e021dacbc06cf23c (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure b/configure
index 83094928b6..7d2a47f80b 100755
--- a/configure
+++ b/configure
@@ -123,8 +123,8 @@ shellQuoteLines()
makeabs()
{
- local FILE=$1
- local RES=$FILE
+ local FILE="$1"
+ local RES="$FILE"
if [ -z "${FILE##/*}" ]; then
true
elif [ "$OSTYPE" = "msys" -a -z "${FILE##[a-zA-Z]:[/\\]*}" ]; then
@@ -2621,7 +2621,9 @@ Additional options:
-l <string> ........ Add an explicit library.
-no-rpath .......... Do not use the library install path as a runtime
- library path.
+ library path. On Apple platforms, this implies using
+ absolute install names (based in -libdir) for dynamic
+ libraries and frameworks.
+ -rpath ............. Link Qt libraries and executables using the library
install path as a runtime library path. Equivalent
to -R install_libpath