Skip to content

Commit db7f331

Browse files
committed
Reverts the clang-17 pin, strip LTO flags from static Lua module build
Signed-off-by: Hanxi Zhang <hanxizh@amazon.com>
1 parent 7db5b70 commit db7f331

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

.github/workflows/daily.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ jobs:
950950
strategy:
951951
fail-fast: false
952952
matrix:
953-
compiler: [gcc, clang-17]
953+
compiler: [gcc, clang]
954954
env:
955955
CC: ${{ matrix.compiler }}
956956
steps:
@@ -1017,7 +1017,7 @@ jobs:
10171017
strategy:
10181018
fail-fast: false
10191019
matrix:
1020-
compiler: [gcc, clang-17]
1020+
compiler: [gcc, clang]
10211021
env:
10221022
CC: ${{ matrix.compiler }}
10231023
steps:
@@ -1088,7 +1088,7 @@ jobs:
10881088
strategy:
10891089
fail-fast: false
10901090
matrix:
1091-
compiler: [gcc, clang-17]
1091+
compiler: [gcc, clang]
10921092
env:
10931093
CC: ${{ matrix.compiler }}
10941094
steps:
@@ -1155,7 +1155,7 @@ jobs:
11551155
strategy:
11561156
fail-fast: false
11571157
matrix:
1158-
compiler: [gcc, clang-17]
1158+
compiler: [gcc, clang]
11591159
env:
11601160
CC: ${{ matrix.compiler }}
11611161
steps:

src/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,9 +734,14 @@ $(TLS_MODULE_NAME): $(SERVER_NAME)
734734
$(RDMA_MODULE_NAME): $(SERVER_NAME)
735735
$(QUIET_CC)$(CC) $(LDFLAGS) -o $@ rdma.c -shared -fPIC $(RDMA_MODULE_CFLAGS)
736736

737+
# Strip LTO flags from OPTIMIZATION for the static Lua module build.
738+
# When archiving into a .a, LTO bitcode objects cause linker failures
739+
# if the system's LLVM gold plugin version doesn't match clang's version.
740+
LUA_MODULE_OPTIMIZATION=$(subst -flto,,$(subst -ffat-lto-objects,,$(subst -flto=auto,,$(OPTIMIZATION))))
741+
737742
# engine_lua.so
738743
$(LUA_MODULE_NAME): .make-prerequisites
739-
$(MAKE) -C modules/lua OPTIMIZATION="$(OPTIMIZATION)" BUILD_LUA="$(BUILD_LUA)"
744+
$(MAKE) -C modules/lua OPTIMIZATION="$(LUA_MODULE_OPTIMIZATION)" BUILD_LUA="$(BUILD_LUA)"
740745

741746
# valkey-cli
742747
$(ENGINE_CLI_NAME): $(ENGINE_CLI_OBJ)

0 commit comments

Comments
 (0)