summaryrefslogtreecommitdiffstats
path: root/recipes-devtools/clang/clang/0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-devtools/clang/clang/0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch')
-rw-r--r--recipes-devtools/clang/clang/0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-devtools/clang/clang/0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch b/recipes-devtools/clang/clang/0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
index 07c8935..a421c6c 100644
--- a/recipes-devtools/clang/clang/0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
+++ b/recipes-devtools/clang/clang/0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
@@ -1,4 +1,4 @@
1From aafbba9f341d5e6d5293371fad130472bee85c5c Mon Sep 17 00:00:00 2001 1From ae428248f697ccf8b98c0da5a9983a1f0ff89bd5 Mon Sep 17 00:00:00 2001
2From: Ovidiu Panait <ovidiu.panait@windriver.com> 2From: Ovidiu Panait <ovidiu.panait@windriver.com>
3Date: Fri, 31 Jan 2020 10:56:11 +0200 3Date: Fri, 31 Jan 2020 10:56:11 +0200
4Subject: [PATCH] clang,llvm: cmake: Fix configure for packages using 4Subject: [PATCH] clang,llvm: cmake: Fix configure for packages using
@@ -52,10 +52,10 @@ index 75b0080f6715..ddf446a13eca 100644
52 endif() 52 endif()
53 endmacro() 53 endmacro()
54diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake 54diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
55index 93e6d67551de..d8123389957b 100644 55index 230620c37027..cb5a9bd41ee8 100644
56--- a/llvm/cmake/modules/AddLLVM.cmake 56--- a/llvm/cmake/modules/AddLLVM.cmake
57+++ b/llvm/cmake/modules/AddLLVM.cmake 57+++ b/llvm/cmake/modules/AddLLVM.cmake
58@@ -1335,7 +1335,6 @@ macro(llvm_add_tool project name) 58@@ -1353,7 +1353,6 @@ macro(llvm_add_tool project name)
59 if( LLVM_BUILD_TOOLS ) 59 if( LLVM_BUILD_TOOLS )
60 get_target_export_arg(${name} LLVM export_to_llvmexports) 60 get_target_export_arg(${name} LLVM export_to_llvmexports)
61 install(TARGETS ${name} 61 install(TARGETS ${name}
@@ -63,7 +63,7 @@ index 93e6d67551de..d8123389957b 100644
63 RUNTIME DESTINATION ${${project}_TOOLS_INSTALL_DIR} 63 RUNTIME DESTINATION ${${project}_TOOLS_INSTALL_DIR}
64 COMPONENT ${name}) 64 COMPONENT ${name})
65 65
66@@ -1346,9 +1345,6 @@ macro(llvm_add_tool project name) 66@@ -1364,9 +1363,6 @@ macro(llvm_add_tool project name)
67 endif() 67 endif()
68 endif() 68 endif()
69 endif() 69 endif()
@@ -73,7 +73,7 @@ index 93e6d67551de..d8123389957b 100644
73 set_target_properties(${name} PROPERTIES FOLDER "Tools") 73 set_target_properties(${name} PROPERTIES FOLDER "Tools")
74 endif() 74 endif()
75 endmacro(llvm_add_tool project name) 75 endmacro(llvm_add_tool project name)
76@@ -1393,7 +1389,6 @@ macro(add_llvm_utility name) 76@@ -1411,7 +1407,6 @@ macro(add_llvm_utility name)
77 if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS) 77 if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS)
78 get_target_export_arg(${name} LLVM export_to_llvmexports) 78 get_target_export_arg(${name} LLVM export_to_llvmexports)
79 install(TARGETS ${name} 79 install(TARGETS ${name}
@@ -81,7 +81,7 @@ index 93e6d67551de..d8123389957b 100644
81 RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR} 81 RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR}
82 COMPONENT ${name}) 82 COMPONENT ${name})
83 83
84@@ -1402,7 +1397,6 @@ macro(add_llvm_utility name) 84@@ -1420,7 +1415,6 @@ macro(add_llvm_utility name)
85 DEPENDS ${name} 85 DEPENDS ${name}
86 COMPONENT ${name}) 86 COMPONENT ${name})
87 endif() 87 endif()
@@ -90,10 +90,10 @@ index 93e6d67551de..d8123389957b 100644
90 set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS_BUILDTREE_ONLY ${name}) 90 set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS_BUILDTREE_ONLY ${name})
91 endif() 91 endif()
92diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake 92diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake
93index 70c2edb8c833..e012fea08982 100644 93index 7fd6628ef55d..57a996d03755 100644
94--- a/llvm/cmake/modules/TableGen.cmake 94--- a/llvm/cmake/modules/TableGen.cmake
95+++ b/llvm/cmake/modules/TableGen.cmake 95+++ b/llvm/cmake/modules/TableGen.cmake
96@@ -189,12 +189,7 @@ macro(add_tablegen target project) 96@@ -195,12 +195,7 @@ macro(add_tablegen target project)
97 97
98 if (ADD_TABLEGEN_DESTINATION AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND 98 if (ADD_TABLEGEN_DESTINATION AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND
99 (LLVM_BUILD_UTILS OR ${target} IN_LIST LLVM_DISTRIBUTION_COMPONENTS)) 99 (LLVM_BUILD_UTILS OR ${target} IN_LIST LLVM_DISTRIBUTION_COMPONENTS))
@@ -106,7 +106,7 @@ index 70c2edb8c833..e012fea08982 100644
106 COMPONENT ${target} 106 COMPONENT ${target}
107 RUNTIME DESTINATION "${ADD_TABLEGEN_DESTINATION}") 107 RUNTIME DESTINATION "${ADD_TABLEGEN_DESTINATION}")
108 if(NOT LLVM_ENABLE_IDE) 108 if(NOT LLVM_ENABLE_IDE)
109@@ -205,6 +200,5 @@ macro(add_tablegen target project) 109@@ -211,6 +206,5 @@ macro(add_tablegen target project)
110 endif() 110 endif()
111 if(ADD_TABLEGEN_EXPORT) 111 if(ADD_TABLEGEN_EXPORT)
112 string(TOUPPER ${ADD_TABLEGEN_EXPORT} export_upper) 112 string(TOUPPER ${ADD_TABLEGEN_EXPORT} export_upper)