aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2019-12-08 19:22:00 +0100
committerMike Pall <mike>2019-12-08 19:22:00 +0100
commit8961a92dd1607108760694af3486b4434602f8be (patch)
treeb23f8d59e38c293cf64f007ddd36608c6ab141c2
parenteba586854b3d55e060d1ee40201dd0ca48aa3f9d (diff)
downloadluajit-8961a92dd1607108760694af3486b4434602f8be.tar.gz
luajit-8961a92dd1607108760694af3486b4434602f8be.tar.bz2
luajit-8961a92dd1607108760694af3486b4434602f8be.zip
OSX: Don't set a default MACOSX_DEPLOYMENT_TARGET.
-rw-r--r--doc/install.html4
-rw-r--r--src/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/install.html b/doc/install.html
index 405f443a..d6e099ed 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -212,8 +212,8 @@ You can add an extra prefix to the search paths by appending the
212make PREFIX=/home/myself/lj2 212make PREFIX=/home/myself/lj2
213</pre> 213</pre>
214<p> 214<p>
215Note for OSX: if the <tt>MACOSX_DEPLOYMENT_TARGET</tt> environment 215Note for OSX: you must set the <tt>MACOSX_DEPLOYMENT_TARGET</tt>
216variable is not set, then it's forced to <tt>10.4</tt>. 216environment variable to a value supported by your toolchain.
217</p> 217</p>
218<h3>Installing LuaJIT</h3> 218<h3>Installing LuaJIT</h3>
219<p> 219<p>
diff --git a/src/Makefile b/src/Makefile
index 2e501069..cde4b9f7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -304,7 +304,7 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector
304endif 304endif
305ifeq (Darwin,$(TARGET_SYS)) 305ifeq (Darwin,$(TARGET_SYS))
306 ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) 306 ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
307 export MACOSX_DEPLOYMENT_TARGET=10.4 307 $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
308 endif 308 endif
309 TARGET_STRIP+= -x 309 TARGET_STRIP+= -x
310 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 310 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC