move luajit definitions to one place

and only use the definitions if libfreeradius-lua is built.

Apparently on an Apple M1, adding the various pagesize options
results in an invalid Mach-O executable

diff --git a/src/bin/radiusd.mk b/src/bin/radiusd.mk
index 0dd3fc8d9638e6bf6147f5647740390bad740abc..2d4321fc87ba5fc3df1480ed9c3b566cc120e8c6 100644 (file)
--- a/src/bin/radiusd.mk
+++ b/src/bin/radiusd.mk
@@ -1,7 +1,7 @@
 TARGET         := radiusd$(E)
 SOURCES                := \
-                       radiusd.c \
-                       radmin.c
+                       radiusd.c \
+                       radmin.c
 
 SRC_CFLAGS     := $(LIBREADLINE_CFLAGS)
 
@@ -11,6 +11,4 @@ TGT_LDFLAGS   := $(LDFLAGS) $(SYSTEMD_LDFLAGS) $(LIBREADLINE_LDFLAGS) $(GPERFTOOLS
 TGT_PREREQS    := $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 
 # Flags needed when linking main executables that link against LuaJIT
-ifneq (,$(findstring darwin,$(TARGET_SYSTEM)))
-TGT_LDLIBS     += -pagezero_size 10000 -image_base 100000000
-endif
+TGT_LDLIBS     += $(LUAJIT_LDLIBS)

diff --git a/src/bin/unit_test_module.mk b/src/bin/unit_test_module.mk
index 0873ef1bac13307a4b1207b01a60f39b09abddf0..4ba60c569670c6fd99b0852c8b31c9f8d68b042f 100644 (file)
--- a/src/bin/unit_test_module.mk
+++ b/src/bin/unit_test_module.mk
@@ -6,9 +6,7 @@ TGT_LDLIBS      := $(LIBS) $(LCRYPT)
 TGT_PREREQS    := $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 
 # Flags needed when linking main executables that link against LuaJIT
-ifneq (,$(findstring darwin,$(TARGET_SYSTEM)))
-TGT_LDLIBS     += -pagezero_size 10000 -image_base 100000000
-endif
+TGT_LDLIBS     += $(LUAJIT_LDLIBS)
 
 # Libraries can't depend on libraries (oops), so make the binary
 # depend on the EAP code...

diff --git a/src/modules/rlm_lua/libfreeradius-lua.mk.in b/src/modules/rlm_lua/libfreeradius-lua.mk.in
index af6cc16ed5efd6f4d9649f8bb0be4bf31ae6a498..7d3bbaf8299b1e4fa4adb9c12a8979a9b0427027 100644 (file)
--- a/src/modules/rlm_lua/libfreeradius-lua.mk.in
+++ b/src/modules/rlm_lua/libfreeradius-lua.mk.in
@@ -15,6 +15,13 @@ TARGETNAME   := @targetname@
 
 ifneq "$(TARGETNAME)" ""
 TARGET         := libfreeradius-lua$(L)
+
+#
+#  OSX requires some extra options. But ARM systems can't use them.
+#
+ifneq (,$(findstring x86_64-apple-darwin,$(TARGET_SYSTEM)))
+LUAJIT_LDLIBS  += -pagezero_size 10000 -image_base 100000000
+endif
 endif
 
 SOURCES                := util.c