Skip to content

Commit 320dcae

Browse files
committed
---
yaml --- r: 2457 b: refs/heads/master c: aa40d61 h: refs/heads/master i: 2455: 1a70726 v: v3
1 parent de441e8 commit 320dcae

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: a8e8585fbc9766d6d65c537c89e960954529e45e
2+
refs/heads/master: aa40d61d5d8299ba72b390cabe4994bbf985c14c

trunk/mk/fuzzer.mk

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@
55
FUZZER_CRATE := $(S)src/fuzzer/fuzzer.rc
66
FUZZER_INPUTS := $(wildcard $(addprefix $(S)src/fuzzer/, *.rs))
77

8-
stage2/fuzzer.o: $(FUZZER_CRATE) $(FUZZER_INPUTS) $(SREQ1)
8+
stage2/fuzzer.o: $(FUZZER_CRATE) $(FUZZER_INPUTS) $(SREQ1) \
9+
stage2/$(CFG_RUSTCLIB)
910
@$(call E, compile: $@)
1011
$(STAGE1) -c -o $@ $<
12+
13+
stage2/fuzzer$(X): stage2/fuzzer.o $(SREQ1)
14+
@$(call E, link [gcc]: $@)
15+
$(Q)gcc $(CFG_GCC_CFLAGS) stage2/glue.o -o $@ $< \
16+
-Lstage2 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd -lm -lrustc
17+
@# dsymutil sometimes fails or prints a warning, but the
18+
@# program still runs. Since it simplifies debugging other
19+
@# programs, I\'ll live with the noise.
20+
-$(Q)$(CFG_DSYMUTIL) $@

trunk/src/fuzzer/Fuzzer.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
fn main() {
1+
fn main(vec[str] args) {
2+
rustc.driver.rustc.main(args);
23
}

trunk/src/fuzzer/fuzzer.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// -*- rust -*-
22

33
use std;
4+
use rustc;
45

56
mod Fuzzer;
67

0 commit comments

Comments
 (0)