Skip to content

Commit

Permalink
Build: Enable the classic linker for macOS builds
Browse files Browse the repository at this point in the history
The rewritten one seems to mess up the generated object files. Since I've no way of testing M1 builds, let's just see if it fixes the failures or if reverting is in order.
  • Loading branch information
rdw-software committed Jan 7, 2025
1 parent 69ca177 commit 93eee6a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions BuildTools/NinjaBuildTools.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ local C_BuildTools = {
displayName = "GNU Compiler Collection",
C_COMPILER = "gcc",
CPP_COMPILER = "g++",
COMPILER_FLAGS_CPP = DEFAULT_COMPILER_FLAGS .. " -std=c++20",
COMPILER_FLAGS_CPP = DEFAULT_COMPILER_FLAGS .. " -std=c++20".. (isMacOS and " -Wl,-ld_classic" or ""),
-- Forced ObjC compilation should be removed once glfw3webgpu is merged into the GLFW core library
COMPILER_FLAGS_C = DEFAULT_COMPILER_FLAGS .. " -std=c11" .. (isMacOS and " -ObjC" or ""),
COMPILER_FLAGS_C = DEFAULT_COMPILER_FLAGS .. " -std=c11" .. (isMacOS and " -ObjC -Wl,-ld_classic" or ""),
C_LINKER = "gcc",
CPP_LINKER = "g++",
-- Must export the entry point of bytecode objects so that LuaJIT can load them via require()
Expand Down

0 comments on commit 93eee6a

Please sign in to comment.