From a2add48643e566cbc68dcf1fc1d59d0117285cea Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Sun, 4 May 2014 11:54:08 -0700 Subject: [PATCH] Allow a custom path to rustc to be specified --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3b2fc77e..0688acca 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +RUSTC ?= rustc RUSTFLAGS ?= OUTDIR ?= ./build @@ -36,17 +37,17 @@ $(BINDIR) $(LIBDIR) $(TMPDIR): mkdir -p '$@' $(TMPDIR)/codegen: $(wildcard src/codegen/*.rs) $(TMPDIR) - rustc -o '$(TMPDIR)/codegen' src/codegen/main.rs $(RUSTFLAGS) + $(RUSTC) -o '$(TMPDIR)/codegen' src/codegen/main.rs $(RUSTFLAGS) src/sdl2/generated/%.rs: $(TMPDIR)/codegen '$(TMPDIR)/codegen' $(patsubst src/sdl2/generated/%,%,$@) src/sdl2/generated/ $(TMPDIR)/libsdl2.dummy: src/sdl2/lib.rs $(RUST_SRC) $(LIBDIR) $(TMPDIR) - rustc --out-dir '$(LIBDIR)' src/sdl2/lib.rs $(RUSTFLAGS) + $(RUSTC) --out-dir '$(LIBDIR)' src/sdl2/lib.rs $(RUSTFLAGS) touch $@ compile_demo: src/demo/main.rs src/demo/video.rs $(TMPDIR)/libsdl2.dummy $(BINDIR) - rustc -o '$(BINDIR)/demo' -L '$(LIBDIR)' src/demo/main.rs + $(RUSTC) -o '$(BINDIR)/demo' -L '$(LIBDIR)' src/demo/main.rs demo: compile_demo '$(BINDIR)/demo'