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

[sdks] Fix llvm-llvm32 build #10611

Merged
merged 2 commits into from
Sep 21, 2018
Merged

[sdks] Fix llvm-llvm32 build #10611

merged 2 commits into from
Sep 21, 2018

Conversation

luhenry
Copy link
Contributor

@luhenry luhenry commented Sep 13, 2018

No description provided.

@luhenry
Copy link
Contributor Author

luhenry commented Sep 13, 2018

@monojenkins backport to 2018-08

@luhenry
Copy link
Contributor Author

luhenry commented Sep 13, 2018

@monojenkins backport to 2018-06

@monojenkins
Copy link
Contributor

@luhenry backporting to 2018-06 failed, the patch results in conflicts:

Applying: [sdks] Fix llvm-llvm32 build
Using index info to reconstruct a base tree...
M	llvm/SUBMODULES.json
M	sdks/builds/llvm.mk
Falling back to patching base and 3-way merge...
Auto-merging sdks/builds/llvm.mk
CONFLICT (content): Merge conflict in sdks/builds/llvm.mk
Auto-merging llvm/SUBMODULES.json
CONFLICT (content): Merge conflict in llvm/SUBMODULES.json
error: Failed to merge in the changes.
Patch failed at 0001 [sdks] Fix llvm-llvm32 build

Please backport manually!

@luhenry
Copy link
Contributor Author

luhenry commented Sep 14, 2018

@monojenkins build failed

@luhenry
Copy link
Contributor Author

luhenry commented Sep 14, 2018

@monojenkins build Linux WebAssembly

@luhenry
Copy link
Contributor Author

luhenry commented Sep 14, 2018

@monojenkins build OS X x64 iOS SDK

@luhenry
Copy link
Contributor Author

luhenry commented Sep 20, 2018

@monojenkins build Linux x64 FullAOT

@luhenry
Copy link
Contributor Author

luhenry commented Sep 20, 2018

@monojenkins build Linux x64 FullAOT+LLVM

@luhenry
Copy link
Contributor Author

luhenry commented Sep 20, 2018

@monojenkins build Windows i386

@luhenry luhenry merged commit 5cb2ef2 into mono:master Sep 21, 2018
@luhenry
Copy link
Contributor Author

luhenry commented Oct 12, 2018

@monojenkins backport to 2018-08

@monojenkins
Copy link
Contributor

@luhenry backporting to 2018-08 failed, the patch results in conflicts:

Applying: [sdks] Fix llvm-llvm32 build
Applying: [wasm] Make sure we compile wasm-cross as 32bits
Using index info to reconstruct a base tree...
M	sdks/builds/wasm.mk
Falling back to patching base and 3-way merge...
Auto-merging sdks/builds/wasm.mk
CONFLICT (content): Merge conflict in sdks/builds/wasm.mk
error: Failed to merge in the changes.
Patch failed at 0002 [wasm] Make sure we compile wasm-cross as 32bits

Please backport manually!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants