[libclc] cccdd05 - libclc: Don't pass linker flags to CLC/LLAsm

Jan Vesely via cfe-commits cfe-commits at lists.llvm.org
Tue Apr 14 07:04:21 PDT 2020


Author: Daniel Stone
Date: 2020-04-14T10:03:27-04:00
New Revision: cccdd0579b5027d0a21fd2dbc0a6a50330134976

URL: https://github.com/llvm/llvm-project/commit/cccdd0579b5027d0a21fd2dbc0a6a50330134976
DIFF: https://github.com/llvm/llvm-project/commit/cccdd0579b5027d0a21fd2dbc0a6a50330134976.diff

LOG: libclc: Don't pass linker flags to CLC/LLAsm

We don't want the regular linker flags for these invocations, since
we're not compiling to the target machine anyway. This fixes things like
'/machine:x64' being unknown when invoked under Windows.

reviewer: jvesely
Differential Revision: https://reviews.llvm.org/D77164

Added: 
    

Modified: 
    libclc/cmake/CMakeCLCInformation.cmake
    libclc/cmake/CMakeLLAsmInformation.cmake

Removed: 
    


################################################################################
diff  --git a/libclc/cmake/CMakeCLCInformation.cmake b/libclc/cmake/CMakeCLCInformation.cmake
index dfbdda9941a7..6eecf4edf0e7 100644
--- a/libclc/cmake/CMakeCLCInformation.cmake
+++ b/libclc/cmake/CMakeCLCInformation.cmake
@@ -5,7 +5,7 @@ endif()
 
 if(NOT CMAKE_CLC_CREATE_STATIC_LIBRARY)
   set(CMAKE_CLC_CREATE_STATIC_LIBRARY
-    "<CMAKE_CLC_ARCHIVE> <LINK_FLAGS> -o <TARGET> <OBJECTS>")
+    "<CMAKE_CLC_ARCHIVE> -o <TARGET> <OBJECTS>")
 endif()
 
 set(CMAKE_INCLUDE_FLAG_CLC "-I")

diff  --git a/libclc/cmake/CMakeLLAsmInformation.cmake b/libclc/cmake/CMakeLLAsmInformation.cmake
index f1d013b02887..73fb28e13135 100644
--- a/libclc/cmake/CMakeLLAsmInformation.cmake
+++ b/libclc/cmake/CMakeLLAsmInformation.cmake
@@ -5,7 +5,7 @@ endif()
 
 if(NOT CMAKE_LLAsm_CREATE_STATIC_LIBRARY)
   set(CMAKE_LLAsm_CREATE_STATIC_LIBRARY
-    "<CMAKE_LLAsm_ARCHIVE> <LINK_FLAGS> -o <TARGET> <OBJECTS>")
+    "<CMAKE_LLAsm_ARCHIVE> -o <TARGET> <OBJECTS>")
 endif()
 
 set(CMAKE_INCLUDE_FLAG_LLAsm "-I")


        


More information about the cfe-commits mailing list