diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-05-14 16:01:41 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-05-19 11:49:21 +0000 |
commit | c7a1ec06313f85a9cf45b44f5940a952348d66d2 (patch) | |
tree | 7925fa50939d269cb801ec4a793cf728174fbad5 /share/qbs/modules/cpp/iar.js | |
parent | ccd3270b76e09dd9b18a7c59ca5e7f7fcf62c14a (diff) | |
download | qbs-c7a1ec06313f85a9cf45b44f5940a952348d66d2.tar.gz |
baremetal: Move cpp-specific JS functions to cpp.js file
Previous commit 79b9b02 added these functions to the ModUtils module,
but seems a best place for these functions is cpp.js file.
Change-Id: Id89b88e1865d003c1c7811220ed01f6d6becfba3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/modules/cpp/iar.js')
-rw-r--r-- | share/qbs/modules/cpp/iar.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js index ad971ed6c..2d6c36db1 100644 --- a/share/qbs/modules/cpp/iar.js +++ b/share/qbs/modules/cpp/iar.js @@ -507,7 +507,7 @@ function dumpMacros(compilerFilePath, tag) { var p = new Process(); p.exec(compilerFilePath, args, true); var outFile = new TextFile(outFilePath, TextFile.ReadOnly); - return ModUtils.extractMacros(outFile.readAll()); + return Cpp.extractMacros(outFile.readAll()); } function dumpCompilerIncludePaths(compilerFilePath, tag) { @@ -774,7 +774,7 @@ function linkerFlags(project, product, inputs, outputs) { allLibraryPaths = allLibraryPaths.uniqueConcat(distributionLibraryPaths); // Library dependencies. - var libraryDependencies = ModUtils.collectLibraryDependencies(product); + var libraryDependencies = Cpp.collectLibraryDependencies(product); if (libraryDependencies) args = args.concat(libraryDependencies.map(function(dep) { return dep.filePath })); |