Skip to content
This repository was archived by the owner on Nov 21, 2018. It is now read-only.

Commit 318e1a8

Browse files
nrcnrc
authored
Merge pull request #21 from nnethercote/CARGO_OPTS
Add $(CARGO_OPTS) to make `all` targets.
2 parents 6485882 + d5855db commit 318e1a8

File tree

14 files changed

+22
-16
lines changed

14 files changed

+22
-16
lines changed

‎README.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ multiple crates, each benchmark has one "crate of interest" which is the one
55
whose compilation time is measured.
66

77
Each benchmark has a makefile with the following targets.
8-
* `all`: builds the entire benchmark. The `CARGO_RUSTC_OPTS` environment
9-
variable can be specified to pass extra arguments to rustc invocations.
8+
* `all`: builds the entire benchmark. The following environment variables can
9+
be used to influence how it is built.
10+
* `CARGO_OPTS`: extra arguments to the `cargo` invocation.
11+
* `CARGO_RUSTC_OPTS`: extra arguments to `cargo rustc` invocations.
1012
* `touch`: touches or removes files in such a way that a subsequent `make`
1113
invocation will build only the crate of interest.
1214
* `clean`: removes all build artifacts.
@@ -16,5 +18,8 @@ site makes use of the `process.sh` script plus some auxiliary scripts not in
1618
this repository.
1719

1820
Local runs comparing two different compilers can be performed with
19-
`compare.py`. This is useful when evaluating compile-time optimizations.
21+
`compare.py`. Invocation is simple:
22+
> `./compare.py <rustc1> <rustc2>`
23+
24+
This is useful when evaluating compile-time optimizations.
2025

‎futures-rs-test-all/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc --test all -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc --test all $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
rm -f target/debug/all-*
77
clean:

‎helloworld/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
find . -name '*.rs' | xargs touch
77
clean:

‎html5ever-2016-08-25/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
find . -name '*.rs' | xargs touch
77
clean:

‎hyper.0.5.0/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
find . -name '*.rs' | xargs touch
77
clean:

‎inflate-0.1.0/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
find . -name '*.rs' | xargs touch
77
clean:

‎issue-32062-equality-relations-complexity/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
find . -name '*.rs' | xargs touch
77
clean:

‎issue-32278-big-array-of-strings/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
find . -name '*.rs' | xargs touch
77
clean:

‎jld-day15-parser/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
find . -name '*.rs' | xargs touch
77
clean:

‎piston-image-0.10.3/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
find . -name '*.rs' | xargs touch
77
clean:

‎regex.0.1.30/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
find . -name '*.rs' | xargs touch
77
clean:

‎rust-encoding-0.3.0/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all touch clean
22

33
all:
4-
cargo rustc -- $(CARGO_RUSTC_OPTS)
4+
cargo rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
55
touch:
66
touch src/lib.rs
77
clean:

‎syntex-0.42.2-incr-clean/makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
all:
1212
RUSTFLAGS="-Z incremental=incr" \
13-
cargo rustc -p syntex_syntax -- $(CARGO_RUSTC_OPTS) -Z incremental-info
13+
cargo rustc -p syntex_syntax $(CARGO_OPTS) -- \
14+
$(CARGO_RUSTC_OPTS) -Z incremental-info
1415
touch:
1516
cargo clean -p syntex_syntax
1617
clean:

‎syntex-0.42.2/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# `../syntax-0.42.2-incr-clean/makefile` for some further notes.
55

66
all:
7-
cargo rustc -p syntex_syntax -- $(CARGO_RUSTC_OPTS)
7+
cargo rustc -p syntex_syntax $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
88
touch:
99
cargo clean -p syntex_syntax
1010
clean:

0 commit comments

Comments
 (0)