llvm-wrapper: cleanup

media-kit · Sep 17, 2024 · 70acdb5 · 70acdb5
1 parent 5727367
commit 70acdb5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/cmake/toolchain_check.cmake b/cmake/toolchain_check.cmake
@@ -24,6 +24,7 @@ elseif(COMPILER_TOOLCHAIN STREQUAL "clang")
 endif()
 
 if(TARGET_CPU STREQUAL "x86_64")
+    set(ld_m_flag "i386pep")
     set(crt_lib "--disable-lib32 --enable-lib64")
     set(LIBOMP_ASMFLAGS_M64 "-DLIBOMP_ASMFLAGS=-m64")
     set(M_TUNE "generic")
@@ -33,10 +34,12 @@ if(TARGET_CPU STREQUAL "x86_64")
         unset(opt)
     endif()
 elseif(TARGET_CPU STREQUAL "i686")
+    set(ld_m_flag "i386pe")
     set(crt_lib "--enable-lib32 --disable-lib64")
     set(M_TUNE "generic")
     unset(opt)
 elseif(TARGET_CPU STREQUAL "aarch64")
+    set(ld_m_flag "arm64pe")
     set(crt_lib "--disable-lib32 --disable-lib64 --enable-libarm64")
     set(M_TUNE "generic")
     set(cfi "-mguard=cf")

diff --git a/toolchain/llvm/llvm-wrapper.cmake b/toolchain/llvm/llvm-wrapper.cmake
@@ -48,13 +48,6 @@ foreach(compiler clang++ g++ c++ clang gcc as)
                    @ONLY)
 endforeach()
 
-if(TARGET_CPU STREQUAL "i686")
-    set(ld_m_flag "i386pe")
-elseif(TARGET_CPU STREQUAL "x86_64")
-    set(ld_m_flag "i386pep")
-elseif(TARGET_CPU STREQUAL "aarch64")
-    set(ld_m_flag "arm64pe")
-endif()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/llvm/llvm-ld.in
                ${CMAKE_INSTALL_PREFIX}/bin/${TARGET_ARCH}-ld
                FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE