| Index: build/toolchain.gypi
|
| diff --git a/build/toolchain.gypi b/build/toolchain.gypi
|
| index de41fe0d00189e2a20576c63004e21a6ad14a9d8..05c0258927d50465d6506f8dbbb067b86c1a87e9 100644
|
| --- a/build/toolchain.gypi
|
| +++ b/build/toolchain.gypi
|
| @@ -109,7 +109,7 @@
|
| }],
|
| ],
|
| }],
|
| - [ 'arm_float_abi!="default"', {
|
| + [ 'arm_float_abi!="default" and arm_float_abi!=""', {
|
| 'cflags': ['-mfloat-abi=<(arm_float_abi)',],
|
| }],
|
| [ 'arm_thumb==1', {
|
| @@ -156,12 +156,12 @@
|
| }],
|
| ],
|
| }],
|
| - [ 'arm_float_abi=="hard"', {
|
| + [ 'arm_float_abi=="hard" or arm_float_abi=="default" or arm_float_abi==""', {
|
| 'defines': [
|
| 'USE_EABI_HARDFLOAT=1',
|
| ],
|
| }],
|
| - [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', {
|
| + [ 'arm_float_abi=="softfp"', {
|
| 'defines': [
|
| 'USE_EABI_HARDFLOAT=0',
|
| ],
|
| @@ -197,7 +197,7 @@
|
| }],
|
| ],
|
| }],
|
| - [ 'arm_float_abi!="default"', {
|
| + [ 'arm_float_abi!="default" and arm_float_abi!=""', {
|
| 'cflags': ['-mfloat-abi=<(arm_float_abi)',],
|
| }],
|
| [ 'arm_thumb==1', {
|
| @@ -244,12 +244,12 @@
|
| }],
|
| ],
|
| }],
|
| - [ 'arm_float_abi=="hard"', {
|
| + [ 'arm_float_abi=="hard" or arm_float_abi=="default" or arm_float_abi==""', {
|
| 'defines': [
|
| 'USE_EABI_HARDFLOAT=1',
|
| ],
|
| }],
|
| - [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', {
|
| + [ 'arm_float_abi=="softfp"', {
|
| 'defines': [
|
| 'USE_EABI_HARDFLOAT=0',
|
| ],
|
|
|