diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-06-26 10:16:18 -0400 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2013-06-26 16:21:20 +0200 |
| commit | 82b69df782d12ffb97874d2fe95cf64189598396 (patch) | |
| tree | 0b584d7f20d6ed401446e629c2aedccd78e23ec1 | |
| parent | 1e35843701029ae5426f7fdc484eb64fa59a6343 (diff) | |
Fix handling of weak frameworks with path names.
Previously if a path to a framework to be weakly linked was given (as
opposed to a framework name), it was strongly linked. The correct flag
to mark the library path as weakly linked is now applied.
Change-Id: I523fd84ba0967e68906611b32305aaf371b1a6b4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | share/qbs/modules/cpp/gcc.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index 9771f3b82..3afa2d8a6 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -57,7 +57,7 @@ function libraryLinkerFlags(product, inputs) for (i in weakFrameworks) { if (weakFrameworks[i].slice(-suffix.length) === suffix) - args.push(weakFrameworks[i] + "/" + FileInfo.fileName(weakFrameworks[i]).slice(0, -suffix.length)); + args = args.concat(['-weak_library', weakFrameworks[i] + "/" + FileInfo.fileName(weakFrameworks[i]).slice(0, -suffix.length)]); else args = args.concat(['-weak_framework', weakFrameworks[i]]); } |