Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ jobs:
strategy:
fail-fast: false
matrix:
compiler: [gcc, clang-17]
compiler: [gcc, clang]
env:
CC: ${{ matrix.compiler }}
steps:
Expand Down Expand Up @@ -1017,7 +1017,7 @@ jobs:
strategy:
fail-fast: false
matrix:
compiler: [gcc, clang-17]
compiler: [gcc, clang]
env:
CC: ${{ matrix.compiler }}
steps:
Expand Down Expand Up @@ -1088,7 +1088,7 @@ jobs:
strategy:
fail-fast: false
matrix:
compiler: [gcc, clang-17]
compiler: [gcc, clang]
env:
CC: ${{ matrix.compiler }}
steps:
Expand Down Expand Up @@ -1155,7 +1155,7 @@ jobs:
strategy:
fail-fast: false
matrix:
compiler: [gcc, clang-17]
compiler: [gcc, clang]
env:
CC: ${{ matrix.compiler }}
steps:
Expand Down
7 changes: 6 additions & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -734,9 +734,14 @@ $(TLS_MODULE_NAME): $(SERVER_NAME)
$(RDMA_MODULE_NAME): $(SERVER_NAME)
$(QUIET_CC)$(CC) $(LDFLAGS) -o $@ rdma.c -shared -fPIC $(RDMA_MODULE_CFLAGS)

# Strip LTO flags from OPTIMIZATION for the static Lua module build.
# When archiving into a .a, LTO bitcode objects cause linker failures
# if the system's LLVM gold plugin version doesn't match clang's version.
LUA_MODULE_OPTIMIZATION=$(subst -flto,,$(subst -ffat-lto-objects,,$(subst -flto=auto,,$(OPTIMIZATION))))

# engine_lua.so
$(LUA_MODULE_NAME): .make-prerequisites
$(MAKE) -C modules/lua OPTIMIZATION="$(OPTIMIZATION)" BUILD_LUA="$(BUILD_LUA)"
$(MAKE) -C modules/lua OPTIMIZATION="$(LUA_MODULE_OPTIMIZATION)" BUILD_LUA="$(BUILD_LUA)"

# valkey-cli
$(ENGINE_CLI_NAME): $(ENGINE_CLI_OBJ)
Expand Down
Loading