RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

llvmbuildectomy - remove conflict file

Browse Source
This commit is contained in:
serge-sans-paille 2020-11-13 15:55:27 +01:00
parent 5a29fda5e7
commit f115c30ea5
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/ExecutionEngine/Orc/Shared/LLVMBuild.txt.rej
View File

@ -1,27 +0,0 @@
***************
*** 1,4 ****
- ;===- ./lib/ExecutionEngine/OrcError/LLVMBuild.txt -------------*- Conf -*--===;
;
; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
; See https://llvm.org/LICENSE.txt for license information.
--- 1,4 ----
+ ;===- ./tools/llvm-jitlink/llvm-jitlink-executor/LLVMBuild.txt -*- Conf -*--===;
;
; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
; See https://llvm.org/LICENSE.txt for license information.
***************
*** 15,21 ****
;===------------------------------------------------------------------------===;
[component_0]
- type = Library
- name = OrcError
- parent = ExecutionEngine
- required_libraries = Support
--- 15,20 ----
;===------------------------------------------------------------------------===;
[component_0]
+ type = Tool
+ name = llvm-jitlink-executor
+ parent = llvm-jitlink