Skip to content

Commit

Permalink
Fix parallel Lua build.
Browse files Browse the repository at this point in the history
  • Loading branch information
elliottslaughter committed Sep 29, 2019
1 parent 9e86d98 commit 0198922
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -297,15 +297,15 @@ build/$(LUA_TAR):
ifeq ($(strip $(TERRA_USE_PUC_LUA)),1)
$(LUA_LIB): build/$(LUA_TAR)
(cd build; tar -xf $(LUA_TAR))
(cd $(LUA_DIR); $(MAKE) $(LUA_TARGET) install INSTALL_TOP="$(LUA_PREFIX)" CC="$(CC) $(PIC_FLAG)")
(cd $(LUA_DIR); $(MAKE) $(LUA_TARGET) INSTALL_TOP="$(LUA_PREFIX)" CC="$(CC) $(PIC_FLAG)")
(cd $(LUA_DIR); $(MAKE) install INSTALL_TOP="$(LUA_PREFIX)" CC="$(CC) $(PIC_FLAG)")
else
$(LUA_LIB): build/$(LUA_TAR)
(cd build; tar -xf $(LUA_TAR))
# MACOSX_DEPLOYMENT_TARGET is a workaround for https://github.com/LuaJIT/LuaJIT/issues/484
(cd $(LUA_DIR); $(MAKE) install PREFIX="$(LUA_PREFIX)" CC="$(CC)" STATIC_CC="$(CC) $(PIC_FLAG)" MACOSX_DEPLOYMENT_TARGET=10.6)
endif

# FIXME: This rule doesn't work on first build because the dependencies don't exist yet
release/include/terra/%.h: $(LUA_INCLUDE)/%.h $(LUA_LIB)
cp $(LUA_INCLUDE)/$*.h $@

Expand Down

0 comments on commit 0198922

Please sign in to comment.