Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android fixes/1.66.0 #4

Merged
merged 6 commits into from
May 12, 2018
Merged

Android fixes/1.66.0 #4

merged 6 commits into from
May 12, 2018

Conversation

SSE4
Copy link
Member

@SSE4 SSE4 commented May 5, 2018

related to the bincrafters/community#189

  1. use b2_toolset_exec for Android as well (as it uses Clang, or GCC)
  2. prefer CXX environment variable in b2_toolset_exec, as it might be set in conan profile in case of cross-compiling
  3. handle additional environment variables which might be set in profile: CFLAGS, CXXFLAGS, LDFLAGS, AR, RANLIB, STRIP, CONAN_CMAKE_FIND_ROOT_PATH
  4. for Android, do not use -stdlib=libc++, as it's harmful, and standalone toolchain already has the only standard library it is configured for. more, -stdlib=libc++ implies -lc++, but standlone toolchain doesn't have libc++.a/libc++.so, only libc++_shared.so and libc++_static.a (which are auto-linked anyway). more information: Android and CONAN_LIBCXX do not play well together conan-io/conan#2402 C++ headers are not found when cross-building for Android conan-io/conan#2049

SSE4 added 5 commits May 4, 2018 23:43
Signed-off-by: SSE4 <tomskside@gmail.com>
…mful

Signed-off-by: SSE4 <tomskside@gmail.com>
Signed-off-by: SSE4 <tomskside@gmail.com>
Signed-off-by: SSE4 <tomskside@gmail.com>
…, RANLIB, etc.), useful for cross-compilation (e.g. Android)

Signed-off-by: SSE4 <tomskside@gmail.com>
Copy link
Member

@grafikrobot grafikrobot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than removing the cmake_find_root_path var looks fine.

conanfile.py Outdated
def b2_profile_tools(self):
if self.b2_toolset == 'gcc' or self.b2_toolset == 'clang':
additional_flags = []
if 'CONAN_CMAKE_FIND_ROOT_PATH' in os.environ:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's a good idea to add special cases for cmake in a b2 specific generator. And reading the docs on cmake_find_roo_path it doesn't seem all to be relevant to the b2 feature.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed, thanks for the feedback

Signed-off-by: SSE4 <tomskside@gmail.com>
Copy link
Member

@grafikrobot grafikrobot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will wait for CI to merge.

@grafikrobot grafikrobot merged commit 4f06f32 into testing/1.66.0 May 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants