summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-09-18 18:22:37 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-09-22 12:21:25 +0200
commit1cbb91b4a06d6e6626c5345d5a9d7d0fbe9e1bbb (patch)
tree3f57ccbabbbbe3263bcf3bb06e9bb88c31aef3a7
parent339c9349a8bcd6242574fba8b557729b2b29ff79 (diff)
Set arm_tune to empty string if mtune flag is not set by toolchain
Since the default arm_tune option applied by chromium is not recognized by our gcc toolchain set arm_tune to empty string to prevent chromium from setting a default. Our toolchains set the arm version which already implies the corresponding mtune option anyway. Change-Id: I0291bd4f0e5706597d37f914e4eeefbd75397bbf Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r--src/core/gyp_run.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 244ce7ec..f79972a2 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -52,7 +52,7 @@ cross_compile {
!isEmpty(MARCH): GYP_ARGS += "-D arm_arch=\"$$MARCH\""
MTUNE = $$extractCFlag("-mtune=.*")
- !isEmpty(MTUNE): GYP_ARGS += "-D arm_tune=\"$$MTUNE\""
+ GYP_ARGS += "-D arm_tune=\"$$MTUNE\""
MFLOAT = $$extractCFlag("-mfloat-abi=.*")
!isEmpty(MFLOAT): GYP_ARGS += "-D arm_float_abi=\"$$MFLOAT\""