From 587038eb5b1b1f03b6d7d49c601217ab6edd65f6 Mon Sep 17 00:00:00 2001 From: Vincent Weevers Date: Sat, 22 Feb 2020 00:45:54 +0100 Subject: [PATCH] Fix android arm64 prebuild by disabling exceptions --- binding.gyp | 2 -- deps/leveldb/leveldb.gyp | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/binding.gyp b/binding.gyp index 43cbf744..ab1b7176 100644 --- a/binding.gyp +++ b/binding.gyp @@ -30,11 +30,9 @@ "ldflags": [ "-fPIC" ], "cflags!": [ "-fno-tree-vrp", - "-fno-exceptions", "-mfloat-abi=hard", "-fPIE" ], - "cflags_cc!": [ "-fno-exceptions" ], "ldflags!": [ "-fPIE" ] }], ["target_arch == 'arm'", { diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp index cb2f9870..27881c9d 100644 --- a/deps/leveldb/leveldb.gyp +++ b/deps/leveldb/leveldb.gyp @@ -166,19 +166,16 @@ ], "ccflags": [ "-pthread", - "-fno-builtin-memcmp", - "-fexceptions" + "-fno-builtin-memcmp" ], "cflags": [ "-fPIC" ], "cflags!": [ - "-fno-exceptions", "-fPIE", "-mfloat-abi=hard", "-Wno-unused-but-set-variable" - ], - "cflags_cc!": [ "-fno-exceptions" ] + ] }], ["target_arch == 'arm'", { "cflags": [