diff --git a/.travis.yml b/.travis.yml index aa6677ef..4a4b464a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -174,7 +174,7 @@ matrix: - os: osx osx_image: xcode7 compiler: gcc - env: COMPILER=g++-5 LUA_VERSION=luajit + env: COMPILER=g++-5 LUA_VERSION=luajit51 - os: osx osx_image: xcode7 diff --git a/bootstrap.py b/bootstrap.py index bf95a939..d1e6bfdf 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -115,6 +115,11 @@ elif 'darwin' in sys.platform: lua_incl = 'luajit-2.0' lua_lib = 'luajit' ldflags.extend(['-pagezero_size 10000', '-image_base 100000000']) + elif re.match(r'luajit5[1-3]', lua_version): + # luajit + lua_incl = 'luajit-2.0' + lua_lib = lua_version[:-2] + '-' + lua_version[-2] + '.' + lua_version[-1] + ldflags.extend(['-pagezero_size 10000', '-image_base 100000000']) else: raise Exception('Unknown lua_version={}' % lua_version)