From d5fdeb2e66ee0e00f35be39d5e9292a7362d6fc4 Mon Sep 17 00:00:00 2001
From: Javier <dev.git@javispedro.com>
Date: Thu, 31 Jan 2019 22:06:26 +0100
Subject: use cmake_cxx_compiler for clang path

---
 app/CMakeLists.txt        | 2 +-
 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
 
-- 
cgit v1.2.3