Skip to content

Commit

Permalink
Merge pull request #11564 from jey/fix-llvm-submake
Browse files Browse the repository at this point in the history
fix parallel build and $PATH in LLVM sub-make

see https://savannah.gnu.org/bugs/index.php?45252
  • Loading branch information
vtjnash committed Jun 4, 2015
2 parents c09aebf + 6381011 commit 7e4f148
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ $(build_prefix): | $(DIRS)
MAKE_DESTDIR = DESTDIR="$(build_staging)/$1"
define make-install
rm -rf $(build_staging)/$1
$(MAKE) -C $1 install $(MAKE_COMMON) $2 $(call MAKE_DESTDIR,$1)
+$(MAKE) -C $1 install $(MAKE_COMMON) $2 $(call MAKE_DESTDIR,$1)
mkdir -p $(build_prefix)
cp -af $(build_staging)/$1$(build_prefix)/* $(build_prefix)
endef
Expand Down Expand Up @@ -647,8 +647,7 @@ endif
echo 1 > $@

$(LLVM_OBJ_TARGET): $(LLVM_OBJ_SOURCE) | $(llvm_python_workaround)
export PATH=$(abspath llvm-$(LLVM_VER)/python2_path):$$PATH && \
$(call make-install,llvm-$(LLVM_VER)/build_$(LLVM_BUILDTYPE),$(LLVM_MFLAGS))
$(call make-install,llvm-$(LLVM_VER)/build_$(LLVM_BUILDTYPE),$(LLVM_MFLAGS) PATH=$(abspath llvm-$(LLVM_VER)/python2_path):$$PATH)
touch -c $@

reinstall-llvm:
Expand Down

0 comments on commit 7e4f148

Please sign in to comment.