diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-02-07 10:40:03 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-02-07 11:58:04 +0000 |
| commit | 6cc86fd59f285054641fea7305f69886d41c9cc0 (patch) | |
| tree | 957d9bd1ab82f90bf29c8a1bb5000d7a69e1e750 | |
| parent | ae00bbcaf071b675ec5bac8c744945517c273e83 (diff) | |
[Backport] 94 adaptation cmake changes
Making changes to cmake files and testing them on CI
is very time consuming, keep in sync cmake files
(at least for LTS branch)
Change-Id: I8e75fcd28791fa4627f13b02619b12d1f9760146
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | cmake/Functions.cmake | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 95f279946..10b8596f7 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -433,16 +433,21 @@ function(add_rsp_command target buildDir) add_custom_command( OUTPUT ${buildDir}/${cmakeTarget}.a BYPRODUCTS - ${buildDir}/${cmakeTarget}.o + ${buildDir}/${cmakeTarget}_objs.o + ${buildDir}/${cmakeTarget}_arcs.o COMMAND clang++ -r -nostdlib -arch ${arch} - -o ${buildDir}/${cmakeTarget}.o + -o ${buildDir}/${cmakeTarget}_objs.o -Wl,-keep_private_externs @${buildDir}/${ninjaTarget}_objects.rsp + COMMAND clang++ -r -nostdlib -arch ${arch} + -o ${buildDir}/${cmakeTarget}_arcs.o + -Wl,-keep_private_externs -Wl,-all_load @${buildDir}/${ninjaTarget}_archives.rsp - COMMAND ar -cr + COMMAND ar -crs ${buildDir}/${cmakeTarget}.a - ${buildDir}/${cmakeTarget}.o + ${buildDir}/${cmakeTarget}_objs.o + ${buildDir}/${cmakeTarget}_arcs.o DEPENDS ${buildDir}/${ninjaTarget}.stamp WORKING_DIRECTORY "${buildDir}/../../.." |