From fbc7ee1d2bb4d544e9176679de236072afa21a8b Mon Sep 17 00:00:00 2001 From: Miguel Horta Date: Tue, 26 Apr 2022 18:21:32 +0100 Subject: [PATCH] Allow clang-7 build for built-tools --- project/jni/application/openttd/AndroidPreBuild.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/project/jni/application/openttd/AndroidPreBuild.sh b/project/jni/application/openttd/AndroidPreBuild.sh index dbed5acba..9d2af67fa 100755 --- a/project/jni/application/openttd/AndroidPreBuild.sh +++ b/project/jni/application/openttd/AndroidPreBuild.sh @@ -1,5 +1,12 @@ #!/bin/sh mkdir -p build-tools -[ -e build-tools/Makefile ] || ${CMAKE_BIN_LOC}cmake -DOPTION_TOOLS_ONLY=ON -B build-tools src +if [ ! -e build-tools/Makefile ]; then + if $(c++ --version | grep -qi clang); then + ${CMAKE_BIN_LOC}cmake -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DOPTION_TOOLS_ONLY=ON -B build-tools src + else + ${CMAKE_BIN_LOC}cmake -DOPTION_TOOLS_ONLY=ON -B build-tools src + fi +fi + make -C build-tools -j8 VERBOSE=1 || exit 1