Update include paths for pre-built-LLVM builds#138
Merged
AnastasiaStulova merged 1 commit intoKhronosGroup:masterfrom Mar 7, 2019
Merged
Update include paths for pre-built-LLVM builds#138AnastasiaStulova merged 1 commit intoKhronosGroup:masterfrom
AnastasiaStulova merged 1 commit intoKhronosGroup:masterfrom
Conversation
Translator builds with a pre-built LLVM recently broke due to headers
in the LLVM source tree no longer being found.
Update our CMake files for LLVM commit r353924 / 95decc39b55 ("[llvm]
[cmake] Provide split include paths in LLVMConfig", 2019-02-13).
Contributor
|
I didn't test it so |
vmaksimo
pushed a commit
to vmaksimo/SPIRV-LLVM-Translator
that referenced
this pull request
Sep 1, 2022
…drspace_printf (KhronosGroup#1364) '"master"' -> '"xmain-web"' (32 commits) (KhronosGroup#138) * Resolve of merge (conflict) 6e70d1c Support SPV_INTEL_non_constant_addrspace_printf (KhronosGroup#1364) '"master"' -> '"xmain-web"' (32 commits) CONFLICT (content): Merge conflict in lib/SPIRV/libSPIRV/spirv_internal.hpp CONFLICT (content): Merge conflict in lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h CONFLICT (content): Merge conflict in include/LLVMSPIRVExtensions.inc commit 6e70d1c Author: Nikita <nikita.kornev@intel.com> Date: Mon Feb 28 13:24:49 2022 +0300 Support SPV_INTEL_non_constant_addrspace_printf (KhronosGroup#1364) Spec: intel/llvm#5227 * Conflict resolution Co-authored-by: iclsrc <ia.compiler.tools.git@intel.com> Co-authored-by: Dmitry Sidorov <dmitry.sidorov@intel.com>
vmaksimo
pushed a commit
to vmaksimo/SPIRV-LLVM-Translator
that referenced
this pull request
Sep 1, 2022
…nstant_addrspace_printf (KhronosGroup#1364) '"master"' -> '"xmain-web"' (32 commits) (KhronosGroup#138) * Resolve of merge (conflict) 6e70d1c Support SPV_INTEL_non_constant_addrspace_printf (KhronosGroup#1364) '"master"' -> '"xmain-web"' (32 commits) CONFLICT (content): Merge conflict in lib/SPIRV/libSPIRV/spirv_internal.hpp CONFLICT (content): Merge conflict in lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h CONFLICT (content): Merge conflict in include/LLVMSPIRVExtensions.inc commit 6e70d1c Author: Nikita <nikita.kornev@intel.com> Date: Mon Feb 28 13:24:49 2022 +0300 Support SPV_INTEL_non_constant_addrspace_printf (KhronosGroup#1364) Spec: intel/llvm#5227 * Conflict resolution Co-authored-by: iclsrc <ia.compiler.tools.git@intel.com> Co-authored-by: Dmitry Sidorov <dmitry.sidorov@intel.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Translator builds with a pre-built LLVM recently broke due to headers
in the LLVM source tree no longer being found.
Update our CMake files for LLVM commit r353924 / 95decc39b55 ("[llvm]
[cmake] Provide split include paths in LLVMConfig", 2019-02-13).