diff --git a/build/crashpad.gypi b/build/crashpad.gypi index 027c7b68..166e768f 100644 --- a/build/crashpad.gypi +++ b/build/crashpad.gypi @@ -25,5 +25,16 @@ 4201, # nonstandard extension used : nameless struct/union. 4324, # structure was padded due to __declspec(align()). ], + 'conditions': [ + ['OS=="linux" or OS=="android"', { + 'conditions': [ + ['clang==0', { + 'cflags': [ + '-Wno-multichar', + ], + }], + ], + }], + ], }, } diff --git a/doc/developing.md b/doc/developing.md index 229e7b00..9f881678 100644 --- a/doc/developing.md +++ b/doc/developing.md @@ -154,7 +154,12 @@ $ CC_target=~/android-ndk-r13_arm64_api21/bin/clang \ --generator-output=out_android_arm64_api21 -f ninja-android ``` -Target “triplets” to use for `ar`, `nm`, and `readelf` are: +It is also possible to use GCC instead of Clang by making the appropriate +substitutions: `aarch64-linux-android-gcc` for `CC_target`; +`aarch64-linux-android-g++` for `CXX_target`; and `-Dclang=0` as an argument to +`gyp_crashpad.py`. + +Target “triplets” to use for `ar`, `nm`, `readelf`, `gcc`, and `g++` are: | Architecture | Target “triplet” | |:-------------|:------------------------|