Index: build/toolchain.gypi |
diff --git a/build/toolchain.gypi b/build/toolchain.gypi |
index 99f357a965a743863ce6c53bb77f8e137d6f8582..684db74d2bfbb4027bd5da2dfe29a2fc535ad6d5 100644 |
--- a/build/toolchain.gypi |
+++ b/build/toolchain.gypi |
@@ -92,10 +92,10 @@ |
'conditions': [ |
['armcompiler=="yes"', { |
'conditions': [ |
- [ 'armv7==1', { |
+ [ 'arm_version==7', { |
'cflags': ['-march=armv7-a',], |
}], |
- [ 'armv7==1 or armv7=="default"', { |
+ [ 'arm_version==7 or arm_version=="default"', { |
'conditions': [ |
[ 'arm_neon==1', { |
'cflags': ['-mfpu=neon',], |
@@ -127,7 +127,7 @@ |
}, { |
# armcompiler=="no" |
'conditions': [ |
- [ 'armv7==1 or armv7=="default"', { |
+ [ 'arm_version==7 or arm_version=="default"', { |
'defines': [ |
'CAN_USE_ARMV7_INSTRUCTIONS=1', |
], |
@@ -180,10 +180,10 @@ |
'conditions': [ |
['armcompiler=="yes"', { |
'conditions': [ |
- [ 'armv7==1', { |
+ [ 'arm_version==7', { |
'cflags': ['-march=armv7-a',], |
}], |
- [ 'armv7==1 or armv7=="default"', { |
+ [ 'arm_version==7 or arm_version=="default"', { |
'conditions': [ |
[ 'arm_neon==1', { |
'cflags': ['-mfpu=neon',], |
@@ -215,7 +215,7 @@ |
}, { |
# armcompiler=="no" |
'conditions': [ |
- [ 'armv7==1 or armv7=="default"', { |
+ [ 'arm_version==7 or arm_version=="default"', { |
'defines': [ |
'CAN_USE_ARMV7_INSTRUCTIONS=1', |
], |