1 files changed, 15 insertions, 13 deletions

diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch
index 9d25bbad..da2475f9 100644
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch
+++ b/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch
@@ -1,38 +1,39 @@
-From 7bbd0058362ac3bb5edd7a82d43e1785810776b3 Mon Sep 17 00:00:00 2001
+From 559fb8f82295ec4dc64a132b6566939b85c1b6fe Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Fri, 29 Mar 2019 08:56:53 +0800
+Date: Thu, 15 Aug 2019 22:34:31 +0800
 Subject: [PATCH] dont export targets for binaries
 
 The projects using LLVM cmake modules look for target binaries in
 sysroot as a result which isn't desirable in this case and isn't needed
 either.
 
-Upstream-Status: Inappropriate [cross-compile specific] 
+Upstream-Status: Inappropriate [cross-compile specific]
 
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
  llvm/cmake/modules/AddLLVM.cmake  | 9 ---------
  llvm/cmake/modules/TableGen.cmake | 6 ------
  2 files changed, 15 deletions(-)
 
 diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index 0df6845..b79f4fa 100644
+index 619e986b8aa..d2bc1a25dd9 100644
 --- a/llvm/cmake/modules/AddLLVM.cmake
 +++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -866,12 +866,6 @@ macro(add_llvm_tool name)
+@@ -898,12 +898,6 @@ macro(add_llvm_tool name)
  
    if ( ${name} IN_LIST LLVM_TOOLCHAIN_TOOLS OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
      if( LLVM_BUILD_TOOLS )
+-      set(export_to_llvmexports)
 -      if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
 -          NOT LLVM_DISTRIBUTION_COMPONENTS)
 -        set(export_to_llvmexports EXPORT LLVMExports)
 -        set_property(GLOBAL PROPERTY LLVM_HAS_EXPORTS True)
 -      endif()
--
+ 
        install(TARGETS ${name}
                ${export_to_llvmexports}
-               RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}
-@@ -884,9 +878,6 @@ macro(add_llvm_tool name)
+@@ -917,9 +911,6 @@ macro(add_llvm_tool name)
        endif()
      endif()
    endif()
@@ -43,18 +44,19 @@ index 0df6845..b79f4fa 100644
  endmacro(add_llvm_tool name)
  
 diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake
-index 3c84ae7..141219f 100644
+index 36c026b5c0f..537acd696d8 100644
 --- a/llvm/cmake/modules/TableGen.cmake
 +++ b/llvm/cmake/modules/TableGen.cmake
-@@ -164,14 +164,8 @@ macro(add_tablegen target project)
+@@ -148,15 +148,9 @@ macro(add_tablegen target project)
    endif()
  
-   if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+   if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND LLVM_BUILD_UTILS)
+-    set(export_to_llvmexports)
 -    if(${target} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
 -        NOT LLVM_DISTRIBUTION_COMPONENTS)
 -      set(export_to_llvmexports EXPORT LLVMExports)
 -    endif()
--
+ 
      install(TARGETS ${target}
              ${export_to_llvmexports}
              RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR})
@@ -62,5 +64,5 @@ index 3c84ae7..141219f 100644
 -  set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target})
  endmacro()
 -- 
-2.7.4
+2.17.1