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

Feature: allow to skip x86_64 -> x86 in cross_building (same os) #1445

Merged
merged 1 commit into from Oct 21, 2019

Conversation

@SSE4
Copy link
Contributor

SSE4 commented Oct 21, 2019

Signed-off-by: SSE4 <tomskside@gmail.com>
@SSE4 SSE4 force-pushed the SSE4:cross_building_x64_x86 branch from 929a413 to 17c86c9 Oct 21, 2019
@lasote
lasote approved these changes Oct 21, 2019
@danimtb danimtb added this to the 1.20 milestone Oct 21, 2019
@danimtb danimtb self-assigned this Oct 21, 2019
@danimtb danimtb merged commit d773138 into conan-io:develop Oct 21, 2019
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
license/cla Contributor License Agreement is signed.
Details
@@ -781,6 +781,9 @@ Parameters:
- **settings** (Required): Conanfile settings. Use ``self.settings``.
- **self_os** (Optional, Defaulted to ``None``): Current operating system where the build is being done.
- **self_arch** (Optional, Defaulted to ``None``): Current architecture where the build is being done.
- **skip_x64_x86** (Optional, Defaulted to ``False``): Do not consider building for ``x86`` host from ``x86_64`` build machine
as cross building, in case of host and build machine use the same operation system. Normally, in such case build machine may

This comment has been minimized.

Copy link
@memsharded

memsharded Oct 21, 2019

Member

operation system => operating system

This comment has been minimized.

Copy link
@danimtb

danimtb Oct 21, 2019

Member

Fix here #1447

@danimtb danimtb referenced this pull request Oct 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.