Fix a bug in parallel builds.

parallaxinc · Apr 13, 2015 · 9a4b4e1 · 9a4b4e1
1 parent 73670fc
commit 9a4b4e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -46,8 +46,8 @@ all: $(BUILD) $(LIBNAME) $(OBJ) Makefile
 $(BUILD)/%.o: $(SRCDIR)/%.cpp
 	$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(LIBNAME):
-	make -C PropellerCompiler CROSS=$(CROSS) BUILD=$(realpath $(BUILD))/PropellerCompiler all
+$(LIBNAME): $(BUILD)
+	$(MAKE) -C PropellerCompiler CROSS=$(CROSS) BUILD=$(realpath $(BUILD))/PropellerCompiler all
 
 $(BUILD):
 	mkdir -p $(BUILD)

diff --git a/PropellerCompiler/Makefile b/PropellerCompiler/Makefile
@@ -28,7 +28,6 @@ else
 endif
 CXXFLAGS += $(CFLAGS)
 
-
 LIBNAME=$(BUILD)/libopenspin.a
 SRCDIR=.
 OBJ=$(BUILD)/BlockNestStackRoutines.o \