diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-09-21 16:13:57 +0300 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-09-21 16:13:57 +0300 |
| commit | 8dae282f66706c5dc3865140b25fbcc5c816d635 (patch) | |
| tree | a259f544c85ce18eefd5a5a4f40584efb23ddc01 /tests | |
| parent | fcd82d6f2c0c1cd780ca18ec2f7c8e3d5a70f814 (diff) | |
| parent | 27bd9ac836b5cd2937b8d19dfa32cb4ff617b73c (diff) | |
Merge branch '1.20' into master
Change-Id: Iac2a17ef4bacf25becc7f2082a8a73a21b2f4d76
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/testdata/remove-duplicate-libs/remove-duplicate-libs.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata/remove-duplicate-libs/remove-duplicate-libs.qbs b/tests/auto/blackbox/testdata/remove-duplicate-libs/remove-duplicate-libs.qbs index 4ffb8d0e2..a6b97bad2 100644 --- a/tests/auto/blackbox/testdata/remove-duplicate-libs/remove-duplicate-libs.qbs +++ b/tests/auto/blackbox/testdata/remove-duplicate-libs/remove-duplicate-libs.qbs @@ -4,8 +4,9 @@ Project { property bool removeDuplicates property string libDir: buildDirectory + "/lib" property bool dummy: { + // most BSD systems (including macOS) use LLVM linker now console.info("is bfd linker: " - + (qbs.toolchain.contains("gcc") && !qbs.hostOS.contains("macos"))) + + (qbs.toolchain.contains("gcc") && !qbs.hostOS.contains("bsd"))) } qbsSearchPaths: "." |