Skip to content
This repository has been archived by the owner on Jan 4, 2021. It is now read-only.

Commit

Permalink
Fix compiler.libcxx for r20b
Browse files Browse the repository at this point in the history
  • Loading branch information
vok1980 committed Jan 17, 2020
1 parent ce3bbd3 commit a328deb
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ class AndroidNDKInstallerConan(ConanFile):
"os": ["Android"],
"arch": ["x86", "x86_64", "armv7", "armv8"]}

options = {"libcxx_shared": [True, False]}
default_options = {'libcxx_shared': False}

def configure(self):
api_level = int(str(self.settings.os.api_level))
if self.settings.os_build in ["Linux", "Macos"] and self.settings.arch_build == "x86":
Expand Down Expand Up @@ -204,7 +207,7 @@ def package_info(self):
self.env_info.ANDROID_PLATFORM = "android-%s" % self.settings.os.api_level
self.env_info.ANDROID_TOOLCHAIN = "clang"
self.env_info.ANDROID_ABI = self._android_abi
self.env_info.ANDROID_STL = "c++_static"
self.env_info.ANDROID_STL = "c++_shared" if self.options.libcxx_shared else "c++_static"

self.env_info.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
self.env_info.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
Expand Down

0 comments on commit a328deb

Please sign in to comment.