From a577a2368553d5ce1cf4d03341428422c7efa4d4 Mon Sep 17 00:00:00 2001 From: Victor Roemer Date: Sat, 20 Aug 2016 19:40:59 -0400 Subject: [PATCH 1/2] Fix tests with luajit on darwin --- bootstrap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap.py b/bootstrap.py index f2202a67..a6badb3d 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -106,10 +106,10 @@ elif 'darwin' in sys.platform: # Using normal lua lua_incl = lua_version[:-1] + '.' + lua_version[-1] lua_lib = lua_version[:-2] + '.' + lua_version[-2] + '.' + lua_version[-1] - elif re.match(r'luajit5[1-3]', lua_version): + elif re.match(r'luajit', lua_version): # luajit lua_incl = 'luajit-2.0' - lua_lib = lua_version[:-2] + '-' + lua_version[-2] + '.' + lua_version[-1] + lua_lib = 'luajit' else: raise Exception('Unknown lua_version={}' % lua_version) From 577058e00c6a6a3ac5193a4d05df6918a43c3ce4 Mon Sep 17 00:00:00 2001 From: Victor Roemer Date: Sat, 20 Aug 2016 19:57:34 -0400 Subject: [PATCH 2/2] Sprinkle magic sauce preventing EXC_BAD_ACCESS --- bootstrap.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap.py b/bootstrap.py index a6badb3d..d5216f08 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -110,6 +110,7 @@ elif 'darwin' in sys.platform: # luajit lua_incl = 'luajit-2.0' lua_lib = 'luajit' + ldflags.extend(['-pagezero_size 10000', '-image_base 100000000']) else: raise Exception('Unknown lua_version={}' % lua_version)