diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-03-31 16:33:32 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-04-05 15:04:55 +0000 |
| commit | af7d67396edadebd3a1f38623453f1af5cae440c (patch) | |
| tree | d1a6d0817078e1e0c4627994d505375ceb427deb /tests/auto/blackbox/testdata-baremetal | |
| parent | e0266ffc85058d371e18b0ae8ea49585697ceb59 (diff) | |
baremetal: Pass externalStaticLibraries() test for KEIL C51/C251/C166
Toolchains C51, C251, C166 do not support configuring library
search paths to link. They support linking with libraries
specified with full absolute paths to them.
To work around this we supplement the absolute library paths
using the cpp.libraryPaths property, if the library is specified
without an absolute or relative path.
Change-Id: Ic11fd8b87356b3a07ba5fd5c9763c8df39d0d4ac
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'tests/auto/blackbox/testdata-baremetal')
| -rw-r--r-- | tests/auto/blackbox/testdata-baremetal/external-static-libraries/external-static-libraries.qbs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/auto/blackbox/testdata-baremetal/external-static-libraries/external-static-libraries.qbs b/tests/auto/blackbox/testdata-baremetal/external-static-libraries/external-static-libraries.qbs index 6fbbb8647..fffb6a03d 100644 --- a/tests/auto/blackbox/testdata-baremetal/external-static-libraries/external-static-libraries.qbs +++ b/tests/auto/blackbox/testdata-baremetal/external-static-libraries/external-static-libraries.qbs @@ -2,20 +2,6 @@ import "../BareMetalApplication.qbs" as BareMetalApplication import "../BareMetalStaticLibrary.qbs" as BareMetalStaticLibrary Project { - condition: { - // The KEIL C51/C251/C166 toolchains support only a - // full paths to the external libraries. - if (qbs.toolchainType === "keil") { - if (qbs.architecture === "mcs51" - || qbs.architecture === "mcs251" - || qbs.architecture === "c166") { - console.info("unsupported toolset: %%" - + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%"); - return false; - } - } - return true; - } property string outputLibrariesDirectory: sourceDirectory + "/libs" BareMetalStaticLibrary { name: "lib-a" |