diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-04-01 09:16:33 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-04-01 09:16:33 +0300 |
| commit | 18e4cf290048726933bb5cf487e947e65b3550a6 (patch) | |
| tree | 9e5024b21dbc18cfb8740fc3cda07804aa1470a4 /mkspecs/common | |
| parent | ae5db669e8989fe793949346d8061c67e5ec31cd (diff) | |
| parent | 9e97d64ccd27adcb2053c90cfbcafaef68e53893 (diff) | |
Merge 5.12 into 5.12.3
Change-Id: I76905e3540585c3be221b89453c725828b05940b
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/ghs-integrity-armv8.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/ghs-integrity-armv8.conf b/mkspecs/common/ghs-integrity-armv8.conf index ee4ce458de..e454cfd245 100644 --- a/mkspecs/common/ghs-integrity-armv8.conf +++ b/mkspecs/common/ghs-integrity-armv8.conf @@ -17,8 +17,8 @@ os_directory = $$(INTEGRITY_DIR) isEmpty(os_directory): \ error("This qmakespec requires $INTEGRITY_DIR to be set") -QMAKE_CC = cxintarm64 -U__ARM_NEON__ -U__ARM_NEON -bsp $$bsp_name -os_dir $$os_directory -non_shared -QMAKE_CXX = cxintarm64 -U__ARM_NEON__ -U__ARM_NEON -bsp $$bsp_name -os_dir $$os_directory -non_shared +QMAKE_CC = cxintarm64 -bsp $$bsp_name -os_dir $$os_directory -non_shared +QMAKE_CXX = cxintarm64 -bsp $$bsp_name -os_dir $$os_directory -non_shared QMAKE_LINK = $$QMAKE_CXX QMAKE_AR = $$QMAKE_CXX -archive -o |