Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc8b3318 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes I2ba90314,I5f47307d 

* changes:
  makeparallel: prepend flags to ninja command line
  Put NINJA_ARGS last
parents 6c45f449 466ea352

core/ninja.mk

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ fastincremental droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): ninja.intermediate 
.INTERMEDIATE: ninja.intermediate

ninja.intermediate: $(KATI_OUTPUTS) $(MAKEPARALLEL)

	@echo Starting build with ninja

	+$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) -C $(TOP) $(NINJA_ARGS) $(filter-out dist,$(ANDROID_TARGETS))

	+$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) $(filter-out dist,$(ANDROID_TARGETS)) -C $(TOP) $(NINJA_ARGS)

else

generateonly droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): $(KATI_OUTPUTS)

	@#empty

tools/makeparallel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -90,3 +90,5 @@ makeparallel_test: $(MAKEPARALLEL) 
	@EXPECTED="-j1"    $(MAKEPARALLEL_TEST) A=-j1234

	@EXPECTED="-j1"    $(MAKEPARALLEL_TEST) A\ -j1234=-j1234

	@EXPECTED="-j1234" $(MAKEPARALLEL_TEST) A\ -j1234=-j1234 -j1234



	@EXPECTED="-j1234 args" ARGS="args" $(MAKEPARALLEL_TEST) -j1234

tools/makeparallel/Makefile.test

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ MAKEPARALLEL ?= ./makeparallel 
.PHONY: test

test:

	@+echo MAKEFLAGS=$${MAKEFLAGS};              \

	result=$$($(MAKEPARALLEL) echo);             \

	result=$$($(MAKEPARALLEL) echo $(ARGS));     \

	echo result: $${result};                     \

	if [ "$${result}" = "$(EXPECTED)" ]; then    \

	  echo SUCCESS && echo;                      \

tools/makeparallel/makeparallel.cpp

+7 −1
Original line number Diff line number Diff line
@@ -298,8 +298,12 @@ int main(int argc, char* argv[]) { 
    argc--;

  }



  if (argc < 2) {

    error(EXIT_FAILURE, 0, "expected command to run");

  }



  const char* path = argv[1];

  std::vector<char*> args(&argv[1], &argv[argc]);

  std::vector<char*> args({argv[1]});



  std::vector<std::string> makeflags = ReadMakeflags();

  if (ParseMakeflags(makeflags, &in_fd, &out_fd, &parallel, &keep_going)) {
@@ -328,6 +332,8 @@ int main(int argc, char* argv[]) { 
    args.push_back(strdup(jarg.c_str()));

  }



  args.insert(args.end(), &argv[2], &argv[argc]);



  args.push_back(nullptr);



  pid_t pid = fork();