diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2014-05-01 18:01:37 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2014-05-01 18:01:37 -0400 |
| commit | f2fbe687b0e3d4ee84dd6681e45bcc00da3f569c (patch) | |
| tree | 6fcd8c4043a55a77cf651fd899c667985bb6058f | |
| parent | 43326ac25552aae8c46f5780c5aea67574b81f6d (diff) | |
| download | servo-f2fbe687b0e3d4ee84dd6681e45bcc00da3f569c.tar.gz servo-f2fbe687b0e3d4ee84dd6681e45bcc00da3f569c.zip | |
make base all: Makefile rule conditional, only build embedding on non-android
| -rw-r--r-- | Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 3588a384719..4f000c683f4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -287,7 +287,6 @@ include $(S)mk/clean.mk .DEFAULT_GOAL := all .PHONY: all -all: servo servo-embedding # Servo helper libraries @@ -338,6 +337,7 @@ $(BINDINGS_SRC)/ParserResults.pkl: $(globalgen_dependencies) \ # Servo binaries ifneq ($(CFG_OSTYPE),linux-androideabi) +all: servo servo-embedding servo: $(DEPS_servo) @$(call E, compile: $@) $(Q)$(RUSTC) $(RFLAGS_servo) -o servo $< --crate-type bin @@ -352,6 +352,7 @@ servo-embedding: servo $(SRC_embedding) $(CRATE_embedding) $(Q)$(RUSTC) $(RFLAGS_embedding) $(CRATE_embedding) touch servo-embedding else +all: servo servo: $(DEPS_servo) @$(call E, compile: $@) $(Q)$(RUSTC) $(RFLAGS_servo) $< -o libservo.so --crate-type dylib |