Skip to content

Commit

Permalink
build: Don't quote $(MAKE)
Browse files Browse the repository at this point in the history
The $(MAKE) variable may contain make(1) arguments in addition to
the make(1) command.

Downstream issue: https://bugs.gentoo.org/793425

Signed-off-by: orbea <[email protected]>
  • Loading branch information
orbea authored and manugarg committed Mar 23, 2022
1 parent cf49b15 commit c6258eb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ MAN_PREFIX = $(PREFIX)/share/man
all: testpactester

jsapi_buildstamp: spidermonkey/js/src
cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" "$(MAKE)" jsapi
cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" $(MAKE) jsapi
touch jsapi_buildstamp

libjs.a: spidermonkey/js/src
cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" "$(MAKE)" jslib
cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" $(MAKE) jslib

pacparser.o: pacparser.c pac_utils.h pacparser.h jsapi_buildstamp
$(CC) $(CFLAGS) $(SHFLAGS) -c pacparser.c -o pacparser.o
Expand Down Expand Up @@ -137,4 +137,4 @@ install-pymod: pymod
clean:
rm -f $(LIBRARY_LINK) $(LIBRARY) libjs.a pacparser.o pactester pymod/pacparser_o_buildstamp jsapi_buildstamp
cd pymod && $(PYTHON) setup.py clean --all
cd spidermonkey && "$(MAKE)" clean
cd spidermonkey && $(MAKE) clean
2 changes: 1 addition & 1 deletion src/spidermonkey/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jslib: js-buildstamp

js-buildstamp:
mkdir -p js/src/$(OBJDIR)
CFLAGS="$(SMCFLAGS)" "$(MAKE)" -C js/src -f Makefile.ref libjs.a
CFLAGS="$(SMCFLAGS)" $(MAKE) -C js/src -f Makefile.ref libjs.a
find js/src -name "jsautocfg.h" -exec cp {} js/src \;
touch js-buildstamp

Expand Down

0 comments on commit c6258eb

Please sign in to comment.