summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-13 08:37:06 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-13 08:37:06 +0000
commitb9bd267a8fa9564a7328baf183b54bf85c1f2f5f (patch)
treede547b26862faf5167e879f2f3cc5c9e74fd90be /Build/source/m4
parent1ab81a0aa4acf1ffffa0b84ff87dab88a255166c (diff)
build system: Always use special flags when linking with libluajit on x64_64-darwin
git-svn-id: svn://tug.org/texlive/trunk@33168 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog5
-rw-r--r--Build/source/m4/kpse-luajit-flags.m46
2 files changed, 11 insertions, 0 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index e328cc4bbe7..9825a74dca1 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-luajit-flags.m4 (KPSE_LUAJIT_DEFINES): Set LUAJIT_LDEXTRA
+ to the additional LDFLAGS for 64-bit Darwin.
+
2014-03-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-pkgs.m4 (kpse_texk_pkgs): Drop dvipdf-x.
diff --git a/Build/source/m4/kpse-luajit-flags.m4 b/Build/source/m4/kpse-luajit-flags.m4
index 5498d7158c3..996dca12e7e 100644
--- a/Build/source/m4/kpse-luajit-flags.m4
+++ b/Build/source/m4/kpse-luajit-flags.m4
@@ -20,6 +20,12 @@ _KPSE_LIB_FLAGS([luajit], [luajit], [tree],
# -------------------
# Set the make variable LUAJIT_DEFINES to the CPPFLAGS required when
# compiling or using the `-lluajit' library.
+# Set the make variable LUAJIT_LDEXTRA to the LDFLAGS required when
+# linking with the `-lluajit' library.
AC_DEFUN([KPSE_LUAJIT_DEFINES], [dnl
+AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
AC_SUBST([LUAJIT_DEFINES], [-DLUAJIT_ENABLE_LUA52COMPAT])
+AS_CASE([$host_os:$host_cpu],
+ [*darwin*:x86_64], [LUAJIT_LDEXTRA='-pagezero_size 10000 -image_base 100000000'])
+AC_SUBST([LUAJIT_LDEXTRA])
]) # KPSE_LUAJIT_DEFINES