diff options
| author | Javier <dev.git@javispedro.com> | 2019-01-31 22:06:26 +0100 |
|---|---|---|
| committer | Javier <dev.git@javispedro.com> | 2019-01-31 22:06:26 +0100 |
| commit | d5fdeb2e66ee0e00f35be39d5e9292a7362d6fc4 (patch) | |
| tree | 8d45a58f528490537fe0d63dc7bbbf51ebc55a24 /app | |
| parent | 07b56d9b0d97f88260da391a6fdb43f6a2ea7d9f (diff) | |
| download | vndroid-d5fdeb2e66ee0e00f35be39d5e9292a7362d6fc4.tar.gz vndroid-d5fdeb2e66ee0e00f35be39d5e9292a7362d6fc4.zip | |
use cmake_cxx_compiler for clang path
Diffstat (limited to 'app')
| -rw-r--r-- | app/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | app/libs/build-openssl.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index c56f72d..e994569 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -14,7 +14,7 @@ add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libssl.so ${CMAKE_LI OUTPUT_DIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ANDROID_NDK=${ANDROID_NDK} ANDROID_ABI=${ANDROID_ABI} - ANDROID_LLVM_TOOLCHAIN_PREFIX=${ANDROID_LLVM_TOOLCHAIN_PREFIX} + ANDROID_CXX_COMPILER=${CMAKE_CXX_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR}/libs/build-openssl.sh COMMENT "Building OpenSSL" WORKING_DIRECTORY openssl) diff --git a/app/libs/build-openssl.sh b/app/libs/build-openssl.sh index 5e32899..59c2a3b 100755 --- a/app/libs/build-openssl.sh +++ b/app/libs/build-openssl.sh @@ -20,7 +20,8 @@ x86_64) ;; esac -export PATH="$ANDROID_LLVM_TOOLCHAIN_PREFIX:$PATH" +toolchain_path=$(dirname $ANDROID_CXX_COMPILER) +export PATH="$toolchain_path:$PATH" perl $SOURCE_DIR/Configure shared $target |