Merge pull request #174 from hanxizh9910/fix-clang-lto-linker-mismatch

Fix clang LTO build failure due to LLVM version mismatch

Author: hanxizh9910

src/Makefile

@@ -24,8 +24,6 @@ OPTIMIZATION?=-O3
 ifeq ($(OPTIMIZATION),-O3)
 	ifeq (clang,$(CLANG))
 		OPTIMIZATION+=-flto
-		# Use llvm-ar for LTO bitcode compatibility when archiving with clang.
-		AR=llvm-ar
 	else
 		OPTIMIZATION+=-flto=auto -ffat-lto-objects
 	endif
@@ -143,6 +141,12 @@ FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(SERVER_LDFLAGS) $(DEBUG)
 FINAL_LIBS=-lm
 DEBUG=-g -ggdb
 
+# Use lld when linking with clang to avoid LLVM version mismatches
+# between clang and the system's gold plugin during LTO.
+ifeq (clang,$(CLANG))
+	FINAL_LDFLAGS+=-fuse-ld=lld
+endif
+
 # Linux ARM32 needs -latomic at linking time
 ifneq (,$(findstring armv,$(uname_M)))
         FINAL_LIBS+=-latomic

src/modules/lua/Makefile

@@ -32,6 +32,8 @@ QUIET_LINK_MOD = @printf '    %b %b\n' $(LINKCOLOR_MOD)LINK$(RESET) $(BINCOLOR_M
 endif
 ifeq (clang,$(CLANG))
 	SHOBJ_LDFLAGS+= -fuse-ld=lld
+	# Use llvm-ar for LTO bitcode compatibility when archiving with clang.
+	AR=llvm-ar
 endif
 
 endif