Skip to content

Commit c6ac72c

Browse files
authored
Escape $(MAKE) path (#12004)
This is particularly useful on Windows where make could be under for example: C:\Program Files (x86)\GnuWin32\bin\make.exe
1 parent 42d3ce2 commit c6ac72c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ $(KERNEL): lib/elixir/lib/*.ex lib/elixir/lib/*/*.ex lib/elixir/lib/*/*/*.ex
9393
echo "==> bootstrap (compile)"; \
9494
$(ERL) -s elixir_compiler bootstrap -s erlang halt; \
9595
fi
96-
$(Q) $(MAKE) unicode
96+
$(Q) "$(MAKE)" unicode
9797
@ echo "==> elixir (compile)";
9898
$(Q) cd lib/elixir && ../../$(ELIXIRC) "lib/**/*.ex" -o ebin;
99-
$(Q) $(MAKE) app
99+
$(Q) "$(MAKE)" app
100100

101101
app: $(APP)
102102
$(APP): lib/elixir/src/elixir.app.src lib/elixir/ebin VERSION $(GENERATE_APP)
@@ -128,7 +128,7 @@ install: compile
128128
$(Q) for file in "$(DESTDIR)$(PREFIX)"/$(LIBDIR)/elixir/bin/*; do \
129129
ln -sf "../$(LIBDIR)/elixir/bin/$${file##*/}" "$(DESTDIR)$(PREFIX)/$(BINDIR)/"; \
130130
done
131-
$(MAKE) install_man
131+
"$(MAKE)" install_man
132132

133133
check_reproducible: compile
134134
$(Q) echo "==> Checking for reproducible builds..."
@@ -146,7 +146,7 @@ check_reproducible: compile
146146
$(Q) mv lib/iex/ebin/* lib/iex/tmp/ebin_reproducible/
147147
$(Q) mv lib/logger/ebin/* lib/logger/tmp/ebin_reproducible/
148148
$(Q) mv lib/mix/ebin/* lib/mix/tmp/ebin_reproducible/
149-
SOURCE_DATE_EPOCH=$(call READ_SOURCE_DATE_EPOCH) $(MAKE) compile
149+
SOURCE_DATE_EPOCH=$(call READ_SOURCE_DATE_EPOCH) "$(MAKE)" compile
150150
$(Q) echo "Diffing..."
151151
$(Q) bin/elixir lib/elixir/diff.exs lib/elixir/ebin/ lib/elixir/tmp/ebin_reproducible/
152152
$(Q) bin/elixir lib/elixir/diff.exs lib/eex/ebin/ lib/eex/tmp/ebin_reproducible/
@@ -160,7 +160,7 @@ clean:
160160
rm -rf ebin
161161
rm -rf lib/*/ebin
162162
rm -rf $(PARSER)
163-
$(Q) $(MAKE) clean_residual_files
163+
$(Q) "$(MAKE)" clean_residual_files
164164

165165
clean_elixir:
166166
$(Q) rm -f lib/*/ebin/Elixir.*.beam
@@ -175,7 +175,7 @@ clean_residual_files:
175175
rm -rf lib/mix/test/fixtures/git_sparse_repo/
176176
rm -rf lib/mix/test/fixtures/archive/ebin/
177177
rm -f erl_crash.dump
178-
$(Q) $(MAKE) clean_man
178+
$(Q) "$(MAKE)" clean_man
179179

180180
#==> Documentation tasks
181181

@@ -326,4 +326,4 @@ install_man: build_man
326326
$(Q) $(INSTALL_DATA) man/elixirc.1 $(DESTDIR)$(MAN_PREFIX)/man1
327327
$(Q) $(INSTALL_DATA) man/iex.1 $(DESTDIR)$(MAN_PREFIX)/man1
328328
$(Q) $(INSTALL_DATA) man/mix.1 $(DESTDIR)$(MAN_PREFIX)/man1
329-
$(MAKE) clean_man
329+
"$(MAKE)" clean_man

0 commit comments

Comments
 (0)