diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2016-05-31 13:36:43 +0900 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-06-01 14:29:37 +0000 |
| commit | 1c96e5baa558fbb3dfd3228b054e20c0765cae4c (patch) | |
| tree | a88871a190e13afd3627eb8e8620768136e88e59 /src/core/gyp_run.pro | |
| parent | 1897f28eb8ddf4b89c144c0503d004595fe8fcc2 (diff) | |
Allow to set arm_thumb=0 with -marm
In case arm_version == 7, arm_thumb used by default.
This change allows to override the configuration.
Change-Id: Ifa924d3d6b6c39da513523fdc40757d277fb7f26
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 9748cc7de..767bd6ac1 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -81,6 +81,7 @@ contains(QT_ARCH, "arm") { else: GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=0 arm_neon_optional=0 } + contains(QMAKE_CFLAGS, "-marm"): GYP_CONFIG += arm_thumb=0 contains(QMAKE_CFLAGS, "-mthumb"): GYP_CONFIG += arm_thumb=1 } |