]> git.proxmox.com Git - ceph.git/blame - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/llvm/0009-fix-tools-install-path.patch
projects / ceph.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / llvm / 0009-fix-tools-install-path.patch
CommitLineData
1e59de90
TL		 1 clang-tools-extra/modularize/CMakeLists.txt | 2 +-
2 clang/cmake/modules/AddClang.cmake | 2 +-
3 clang/tools/c-index-test/CMakeLists.txt | 2 +-
4 clang/tools/clang-format/CMakeLists.txt | 2 +-
5 clang/tools/scan-build/CMakeLists.txt | 2 +-
6 clang/tools/scan-view/CMakeLists.txt | 2 +-
7 clang/utils/hmaptool/CMakeLists.txt | 2 +-
8 flang/cmake/modules/AddFlang.cmake | 2 +-
9 flang/tools/f18/CMakeLists.txt | 4 ++--
10 lld/cmake/modules/AddLLD.cmake | 2 +-
11 lld/tools/lld/CMakeLists.txt | 2 +-
12 lldb/cmake/modules/AddLLDB.cmake | 2 +-
13 12 files changed, 13 insertions(+), 13 deletions(-)
14
15diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt
16index 4caae81c49b6..8c459c51cc34 100644
17--- a/clang-tools-extra/modularize/CMakeLists.txt
18+++ b/clang-tools-extra/modularize/CMakeLists.txt
19@@ -23,5 +23,5 @@ clang_target_link_libraries(modularize
20 )
21
22 install(TARGETS modularize
23- RUNTIME DESTINATION bin
24+ RUNTIME DESTINATION tools/llvm
25 COMPONENT clang-extras)
26diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
27index 704278a0e93b..e8a87f574474 100644
28--- a/clang/cmake/modules/AddClang.cmake
29+++ b/clang/cmake/modules/AddClang.cmake
30@@ -170,7 +170,7 @@ macro(add_clang_tool name)
31
32 install(TARGETS ${name}
33 ${export_to_clangtargets}
34- RUNTIME DESTINATION bin
35+ RUNTIME DESTINATION tools/llvm
36 COMPONENT ${name})
37
38 if(NOT LLVM_ENABLE_IDE)
39diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
40index ceef4b08637c..ce6d7799475b 100644
41--- a/clang/tools/c-index-test/CMakeLists.txt
42+++ b/clang/tools/c-index-test/CMakeLists.txt
43@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
44 set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH
45 "@executable_path/../../lib")
46 else()
47- set(INSTALL_DESTINATION bin)
48+ set(INSTALL_DESTINATION tools/llvm)
49 endif()
50
51 install(TARGETS c-index-test
52diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt
53index 35ecdb11253c..d1b800dfdadc 100644
54--- a/clang/tools/clang-format/CMakeLists.txt
55+++ b/clang/tools/clang-format/CMakeLists.txt
56@@ -36,5 +36,5 @@ install(PROGRAMS clang-format.py
57 DESTINATION share/clang
58 COMPONENT clang-format)
59 install(PROGRAMS git-clang-format
60- DESTINATION bin
61+ DESTINATION tools/llvm
62 COMPONENT clang-format)
63diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt
64index ec0702d76f18..9a34a09921b1 100644
65--- a/clang/tools/scan-build/CMakeLists.txt
66+++ b/clang/tools/scan-build/CMakeLists.txt
67@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD)
68 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
69 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
70 install(PROGRAMS bin/${BinFile}
71- DESTINATION bin
72+ DESTINATION tools/llvm
73 COMPONENT scan-build)
74 endforeach()
75
76diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
77index 22edb974bac7..60f69d358fb9 100644
78--- a/clang/tools/scan-view/CMakeLists.txt
79+++ b/clang/tools/scan-view/CMakeLists.txt
80@@ -22,7 +22,7 @@ if(CLANG_INSTALL_SCANVIEW)
81 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
82 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
83 install(PROGRAMS bin/${BinFile}
84- DESTINATION bin
85+ DESTINATION tools/llvm
86 COMPONENT scan-view)
87 endforeach()
88
89diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt
90index 62f2de0cb15c..38dc821c76de 100644
91--- a/clang/utils/hmaptool/CMakeLists.txt
92+++ b/clang/utils/hmaptool/CMakeLists.txt
93@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM
94
95 list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL})
96 install(PROGRAMS ${CLANG_HMAPTOOL}
97- DESTINATION bin
98+ DESTINATION tools/llvm
99 COMPONENT hmaptool)
100
101 add_custom_target(hmaptool ALL DEPENDS ${Depends})
102diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
103index 7fe8b7e9f406..b338dddd0850 100644
104--- a/flang/cmake/modules/AddFlang.cmake
105+++ b/flang/cmake/modules/AddFlang.cmake
106@@ -120,7 +120,7 @@ macro(add_flang_tool name)
107
108 install(TARGETS ${name}
109 ${export_to_flangtargets}
110- RUNTIME DESTINATION bin
111+ RUNTIME DESTINATION tools/llvm
112 COMPONENT ${name})
113
114 if(NOT LLVM_ENABLE_IDE)
115diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
116index f3af6e8312fe..aa58108b332b 100644
117--- a/flang/tools/f18/CMakeLists.txt
118+++ b/flang/tools/f18/CMakeLists.txt
119@@ -58,7 +58,7 @@ endforeach()
120
121 add_custom_target(module_files ALL DEPENDS ${MODULE_FILES})
122
123-install(TARGETS f18 DESTINATION bin)
124+install(TARGETS f18 DESTINATION tools/llvm)
125
126 set(FLANG_INTRINSIC_MODULES_DIR ${FLANG_BINARY_DIR}/include/flang)
127 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${CMAKE_BINARY_DIR}/tools/flang/bin/flang @ONLY)
128@@ -68,4 +68,4 @@ set(FLANG_INTRINSIC_MODULES_DIR ${CMAKE_INSTALL_PREFIX}/include/flang)
129 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${FLANG_BINARY_DIR}/bin/flang-install.sh @ONLY)
130 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/f18_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/f18_version.h @ONLY)
131
132-install(PROGRAMS ${FLANG_BINARY_DIR}/bin/flang-install.sh DESTINATION bin RENAME flang PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
133+install(PROGRAMS ${FLANG_BINARY_DIR}/bin/flang-install.sh DESTINATION tools/llvm RENAME flang PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
134diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
135index 23df41312403..86f4eafeed07 100644
136--- a/lld/cmake/modules/AddLLD.cmake
137+++ b/lld/cmake/modules/AddLLD.cmake
138@@ -54,7 +54,7 @@ macro(add_lld_tool name)
139
140 install(TARGETS ${name}
141 ${export_to_lldtargets}
142- RUNTIME DESTINATION bin
143+ RUNTIME DESTINATION tools/llvm
144 COMPONENT ${name})
145
146 if(NOT CMAKE_CONFIGURATION_TYPES)
147diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt
148index e6f72fcd3488..0e5a2c81e825 100644
149--- a/lld/tools/lld/CMakeLists.txt
150+++ b/lld/tools/lld/CMakeLists.txt
151@@ -21,7 +21,7 @@ target_link_libraries(lld
152 )
153
154 install(TARGETS lld
155- RUNTIME DESTINATION bin)
156+ RUNTIME DESTINATION tools/llvm)
157
158 if(NOT LLD_SYMLINKS_TO_CREATE)
159 set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld)
160diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
161index 4ed5c647c5d2..cb31901dddbb 100644
162--- a/lldb/cmake/modules/AddLLDB.cmake
163+++ b/lldb/cmake/modules/AddLLDB.cmake
164@@ -187,7 +187,7 @@ function(add_lldb_executable name)
165 endif()
166
167 if(ARG_GENERATE_INSTALL)
168- set(install_dest bin)
169+ set(install_dest tools/llvm)
170 if(ARG_INSTALL_PREFIX)
171 set(install_dest ${ARG_INSTALL_PREFIX})
172 endif()
Ceph