What if we just use GCC as the assembler

dotnet · Oct 31, 2024 · ca28a8f · ca28a8f
1 parent 1031869
commit ca28a8f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/build/cmake/aarch64-linux-gnu.cmake b/build/cmake/aarch64-linux-gnu.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME "Linux")
 set(CMAKE_SYSTEM_PROCESSOR "aarch64")
 
-set(CMAKE_ASM_COMPILER "/usr/bin/aarch64-linux-gnu-as")
+set(CMAKE_ASM_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
 set(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
 

diff --git a/build/cmake/aarch64-w64-mingw32.cmake b/build/cmake/aarch64-w64-mingw32.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME "Windows")
 set(CMAKE_SYSTEM_PROCESSOR "aarch64")
 
-set(CMAKE_ASM_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-as")
+set(CMAKE_ASM_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-gcc")
 set(CMAKE_C_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-gcc")
 set(CMAKE_CXX_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-g++")
 set(CMAKE_RC_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-windres")

diff --git a/build/cmake/arm-linux-gnueabihf.cmake b/build/cmake/arm-linux-gnueabihf.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME "Linux")
 set(CMAKE_SYSTEM_PROCESSOR "armv7l")
 
-set(CMAKE_ASM_COMPILER "/usr/bin/arm-linux-gnueabihf-as")
+set(CMAKE_ASM_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc")
 set(CMAKE_C_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/arm-linux-gnueabihf-g++")
 

diff --git a/build/cmake/x86_64-linux-gnu.cmake b/build/cmake/x86_64-linux-gnu.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME "Linux")
 set(CMAKE_SYSTEM_PROCESSOR "x86_64")
 
-set(CMAKE_ASM_COMPILER "/usr/bin/x86_64-linux-gnu-as")
+set(CMAKE_ASM_COMPILER "/usr/bin/x86_64-linux-gnu-gcc")
 set(CMAKE_C_COMPILER "/usr/bin/x86_64-linux-gnu-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/x86_64-linux-gnu-g++")
 

diff --git a/build/nuke/Native/VulkanLoader.cs b/build/nuke/Native/VulkanLoader.cs
@@ -26,8 +26,6 @@
 using static Nuke.Common.Tools.GitHub.GitHubTasks;
 
 partial class Build {
-    // TODO the dishes
-
     AbsolutePath VulkanLoaderPath => RootDirectory / "build" / "submodules" / "Vulkan-Loader";
 
     Target VulkanLoader => CommonTarget
@@ -70,7 +68,7 @@ partial class Build {
                         {
                             EnsureCleanDirectory(buildDir);
 
-                            InheritedShell($"{prepare} -DUSE_GAS=OFF {GetCMakeToolchainFlag(triple)}", buildDir).AssertZeroExitCode();
+                            InheritedShell($"{prepare} {GetCMakeToolchainFlag(triple)}", buildDir).AssertZeroExitCode();
                             InheritedShell(build, buildDir).AssertZeroExitCode();
 
                             InheritedShell($"{triple}-strip --strip-unneeded loader/libvulkan.so", buildDir).AssertZeroExitCode();