fixup! build: Generate toolchain.cmake in depends

hebasto · hebasto · commit 6196363f72c6 · 2024-07-31T14:42:17.000+01:00
diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in
@@ -15,31 +15,6 @@ if(@depends_crosscompiling@)
   set(CMAKE_SYSTEM_PROCESSOR @host_arch@)
 endif()
 
-function(split_compiler_launcher env_compiler launcher compiler)
-  set(${launcher})
-  list(GET ${env_compiler} 0 start_token)
-  if(start_token STREQUAL "env")
-    set(${compiler})
-    set(env_arg_parsing TRUE)
-    foreach(token IN LISTS ${env_compiler})
-      if(env_arg_parsing)
-        list(APPEND ${launcher} ${token})
-        set(env_arg_parsing FALSE)
-        continue()
-      elseif(token STREQUAL "-u")
-        list(APPEND ${launcher} ${token})
-        set(env_arg_parsing TRUE)
-        continue()
-      endif()
-      list(APPEND ${compiler} ${token})
-    endforeach()
-  else()
-    set(${compiler} ${${env_compiler}})
-  endif()
-  set(${launcher} ${${launcher}} PARENT_SCOPE)
-  set(${compiler} ${${compiler}} PARENT_SCOPE)
-endfunction()
-
 if(NOT DEFINED CMAKE_C_FLAGS_INIT)
   set(CMAKE_C_FLAGS_INIT "@CFLAGS@")
 endif()
@@ -51,9 +26,7 @@ if(NOT DEFINED CMAKE_C_FLAGS_DEBUG_INIT)
 endif()
 
 if(NOT DEFINED CMAKE_C_COMPILER)
-  set(DEPENDS_C_COMPILER_WITH_LAUNCHER @CC@)
-  split_compiler_launcher(DEPENDS_C_COMPILER_WITH_LAUNCHER CMAKE_C_COMPILER_LAUNCHER CMAKE_C_COMPILER)
-  set(CMAKE_C_LINKER_LAUNCHER ${CMAKE_C_COMPILER_LAUNCHER})
+  set(CMAKE_C_COMPILER @CC@)
 endif()
 
 if(NOT DEFINED CMAKE_CXX_FLAGS_INIT)
@@ -70,13 +43,8 @@ if(NOT DEFINED CMAKE_CXX_FLAGS_DEBUG_INIT)
 endif()
 
 if(NOT DEFINED CMAKE_CXX_COMPILER)
-  set(DEPENDS_CXX_COMPILER_WITH_LAUNCHER @CXX@)
-  split_compiler_launcher(DEPENDS_CXX_COMPILER_WITH_LAUNCHER CMAKE_CXX_COMPILER_LAUNCHER CMAKE_CXX_COMPILER)
-  set(CMAKE_CXX_LINKER_LAUNCHER ${CMAKE_CXX_COMPILER_LAUNCHER})
-
+  set(CMAKE_CXX_COMPILER @CXX@)
   set(CMAKE_OBJCXX_COMPILER ${CMAKE_CXX_COMPILER})
-  set(CMAKE_OBJCXX_COMPILER_LAUNCHER ${CMAKE_CXX_COMPILER_LAUNCHER})
-  set(CMAKE_OBJCXX_LINKER_LAUNCHER ${CMAKE_CXX_LINKER_LAUNCHER})
 endif()
 
 # The DEPENDS_COMPILE_DEFINITIONS* variables are to be treated as lists.
