diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-09-03 15:23:43 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-08 18:36:12 +0000 |
| commit | 77c59ebc2d7562091a3383a949517d6e65a08472 (patch) | |
| tree | 1f36354f14f4f2c22820da365223ec98c70c36a5 | |
| parent | 0b183e9235e2a40c415c06a4fff81b65a3731408 (diff) | |
Extend cflags also for mcpu
Updates Chromium with:
* f8a944bbe5f Add support for mcpu
Change-Id: I3f9d31f3ec99badd62d82fca911bee22dde5985f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 19264c2d2c8b3b04cf08e55358251185c3b339b9)
(cherry picked from commit 2ae514322a48002415b68e16f38851502bc8717f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/Functions.cmake | 6 | ||||
| m--------- | src/3rdparty | 0 |
2 files changed, 6 insertions, 0 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 68c7657a3..8e466cdea 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -755,7 +755,9 @@ macro(append_compiler_linker_sdk_setup) windows_sdk_path=\"${windowsSdkPath}\" ) endif() + get_gn_arch(cpu ${TEST_architecture_arch}) if(LINUX AND CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm") + extend_gn_list_cflag(gnArgArg ARG arm_tune CFLAG mtune @@ -768,6 +770,10 @@ macro(append_compiler_linker_sdk_setup) ARG arm_arch CFLAG march ) + extend_gn_list_cflag(gnArgArg + ARG arm_cpu + CFLAG mcpu + ) extract_cflag(cflag "mfpu") get_arm_version(arm_version "${cflag}") extend_gn_list(gnArgArg diff --git a/src/3rdparty b/src/3rdparty -Subproject 7c0da756208a1b50c06e37e53c0df14f584fd70 +Subproject f8a944bbe5fb9c7f1886a76f8243f1edf67fc04 |