Skip to content

Commit ca28a8f

Browse files
committed
What if we just use GCC as the assembler
1 parent 1031869 commit ca28a8f

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

build/cmake/aarch64-linux-gnu.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CMAKE_SYSTEM_NAME "Linux")
22
set(CMAKE_SYSTEM_PROCESSOR "aarch64")
33

4-
set(CMAKE_ASM_COMPILER "/usr/bin/aarch64-linux-gnu-as")
4+
set(CMAKE_ASM_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
55
set(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
66
set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
77

build/cmake/aarch64-w64-mingw32.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CMAKE_SYSTEM_NAME "Windows")
22
set(CMAKE_SYSTEM_PROCESSOR "aarch64")
33

4-
set(CMAKE_ASM_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-as")
4+
set(CMAKE_ASM_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-gcc")
55
set(CMAKE_C_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-gcc")
66
set(CMAKE_CXX_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-g++")
77
set(CMAKE_RC_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-windres")

build/cmake/arm-linux-gnueabihf.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CMAKE_SYSTEM_NAME "Linux")
22
set(CMAKE_SYSTEM_PROCESSOR "armv7l")
33

4-
set(CMAKE_ASM_COMPILER "/usr/bin/arm-linux-gnueabihf-as")
4+
set(CMAKE_ASM_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc")
55
set(CMAKE_C_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc")
66
set(CMAKE_CXX_COMPILER "/usr/bin/arm-linux-gnueabihf-g++")
77

build/cmake/x86_64-linux-gnu.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CMAKE_SYSTEM_NAME "Linux")
22
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
33

4-
set(CMAKE_ASM_COMPILER "/usr/bin/x86_64-linux-gnu-as")
4+
set(CMAKE_ASM_COMPILER "/usr/bin/x86_64-linux-gnu-gcc")
55
set(CMAKE_C_COMPILER "/usr/bin/x86_64-linux-gnu-gcc")
66
set(CMAKE_CXX_COMPILER "/usr/bin/x86_64-linux-gnu-g++")
77

build/nuke/Native/VulkanLoader.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
using static Nuke.Common.Tools.GitHub.GitHubTasks;
2727

2828
partial class Build {
29-
// TODO the dishes
30-
3129
AbsolutePath VulkanLoaderPath => RootDirectory / "build" / "submodules" / "Vulkan-Loader";
3230

3331
Target VulkanLoader => CommonTarget
@@ -70,7 +68,7 @@ partial class Build {
7068
{
7169
EnsureCleanDirectory(buildDir);
7270

73-
InheritedShell($"{prepare} -DUSE_GAS=OFF {GetCMakeToolchainFlag(triple)}", buildDir).AssertZeroExitCode();
71+
InheritedShell($"{prepare} {GetCMakeToolchainFlag(triple)}", buildDir).AssertZeroExitCode();
7472
InheritedShell(build, buildDir).AssertZeroExitCode();
7573

7674
InheritedShell($"{triple}-strip --strip-unneeded loader/libvulkan.so", buildDir).AssertZeroExitCode();

0 commit comments

Comments
 (0)