From a0991ef6092292e0ccf360d5fb84ba5c892e2178 Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Tue, 18 Jun 2024 22:43:13 -0400 Subject: [PATCH] Fix LuaJIT build when LDFLAGS is defined --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ae9840648..506c9294f 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,7 @@ ifeq ($(UNAME_S),Darwin) CPPFLAGS += -stdlib=libc++ endif +LUAJIT_LDFLAGS := $(LDFLAGS) LDFLAGS += `pkg-config --libs $(PACKAGES)` ifeq ($(UNAME_S),Darwin) @@ -235,10 +236,10 @@ appimage: ifeq ($(CROSS),arm64) third_party/luajit/src/libluajit.a: - $(MAKE) $(MAKEOPTS) -C third_party/luajit/src amalg HOST_CC=cc CROSS=aarch64-linux-gnu- TARGET_CFLAGS=--sysroot=/opt/cross/sysroot BUILDMODE=static CFLAGS=$(LUAJIT_CFLAGS) XCFLAGS="-DLUAJIT_ENABLE_GC64 -DLUAJIT_ENABLE_LUA52COMPAT" MACOSX_DEPLOYMENT_TARGET=10.15 + $(MAKE) $(MAKEOPTS) -C third_party/luajit/src amalg HOST_CC=cc CROSS=aarch64-linux-gnu- TARGET_CFLAGS=--sysroot=/opt/cross/sysroot BUILDMODE=static CFLAGS=$(LUAJIT_CFLAGS) LDFLAGS=$(LUAJIT_LDFLAGS) XCFLAGS="-DLUAJIT_ENABLE_GC64 -DLUAJIT_ENABLE_LUA52COMPAT" MACOSX_DEPLOYMENT_TARGET=10.15 else third_party/luajit/src/libluajit.a: - $(MAKE) $(MAKEOPTS) -C third_party/luajit/src amalg CC=$(CC) BUILDMODE=static CFLAGS=$(LUAJIT_CFLAGS) XCFLAGS="-DLUAJIT_ENABLE_GC64 -DLUAJIT_ENABLE_LUA52COMPAT" MACOSX_DEPLOYMENT_TARGET=10.15 + $(MAKE) $(MAKEOPTS) -C third_party/luajit/src amalg CC=$(CC) BUILDMODE=static CFLAGS=$(LUAJIT_CFLAGS) LDFLAGS=$(LUAJIT_LDFLAGS) XCFLAGS="-DLUAJIT_ENABLE_GC64 -DLUAJIT_ENABLE_LUA52COMPAT" MACOSX_DEPLOYMENT_TARGET=10.15 endif $(TARGET): $(OBJECTS)