mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-10-04 21:00:19 +00:00
fix merge
This commit is contained in:
parent
1a8415589f
commit
37d3ce298b
2
debian/control
vendored
2
debian/control
vendored
@ -1,4 +1,4 @@
|
||||
Source: llvm-toolchain-11
|
||||
Source: llvm-toolchain-snapshot
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Rules-Requires-Root: no
|
||||
|
1
debian/libomp-X.Y-dev.install.in
vendored
1
debian/libomp-X.Y-dev.install.in
vendored
@ -2,7 +2,6 @@
|
||||
|
||||
/usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include/omp*.h
|
||||
[!armhf !mips64el !mipsel] /usr/lib/llvm-@LLVM_VERSION@/include/ompt-multiplex.h
|
||||
>>>>>>> origin/11
|
||||
/usr/lib/llvm-@LLVM_VERSION@/lib/libgomp.so
|
||||
/usr/lib/llvm-@LLVM_VERSION@/lib/libiomp5.so
|
||||
/usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so
|
||||
|
Loading…
Reference in New Issue
Block a user