diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-30 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-30 01:00:07 +0100 |
| commit | 0a7302abbc47a0db25f119ee4f5144bbaf0d9d6f (patch) | |
| tree | e4b05a56e09bb6401a9ee863725da2f0e52858f1 /mkspecs/common/ghs-integrity-armv8.conf | |
| parent | 8d154810f56b9d831f78f454fb2b05e98c246313 (diff) | |
| parent | 20b7e18146e28e73cba52a63a3415c6828f1f6f5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9935bacae0d6ba532418fc3d28adbc7ca1463604
Diffstat (limited to 'mkspecs/common/ghs-integrity-armv8.conf')
| -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 |