summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2016-08-30 11:08:33 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2016-08-30 09:36:50 +0000
commit354896326e41fe82ca75559af775958845ff3e40 (patch)
tree6c7d7a86d1c6bb9cec821b68078d6ab8671578e7
parentba1ebca70300d39fd8585aea93b5fbcd8571c7ee (diff)
Fix qbs build
The Qt Creator main project has "minimumQbsVersion" set to 1.6 now, meaning that linker flags must no longer be escaped. Change-Id: I6c095c0126a600015361268fdbf81f26549d2ac7 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--3rdparty/elfutils/libdw/libdw.qbs2
1 files changed, 1 insertions, 1 deletions
diff --git a/3rdparty/elfutils/libdw/libdw.qbs b/3rdparty/elfutils/libdw/libdw.qbs
index c61aab8..85eee38 100644
--- a/3rdparty/elfutils/libdw/libdw.qbs
+++ b/3rdparty/elfutils/libdw/libdw.qbs
@@ -11,7 +11,7 @@ ElfUtilsDynamicLib {
// Workaround for broken dependencies
cpp.linkerFlags: base.concat([
"-L" + project.buildDirectory + "/elfutils",
- "-Wl,--whole-archive", "-lebl", "-ldwelf", "-ldwfl", "-Wl,--no-whole-archive"
+ "--whole-archive", "-lebl", "-ldwelf", "-ldwfl", "--no-whole-archive"
])
Export {