From c4ca81cbbe620dcfdd41867b98b1150188e81f94 Mon Sep 17 00:00:00 2001 From: Elliott Slaughter Date: Fri, 23 Aug 2019 16:21:56 -0700 Subject: [PATCH] Fix parallel Lua build. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 780fbe80..832fb225 100644 --- a/Makefile +++ b/Makefile @@ -297,7 +297,8 @@ 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)) @@ -305,7 +306,6 @@ $(LUA_LIB): build/$(LUA_TAR) (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 $@