Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-29 18:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

make base all: Makefile rule conditional, only build embedding on non-android

Browse source
This commit is contained in:
Mike Blumenkrantz 2014-05-01 18:01:37 -04:00
parent 43326ac255
commit f2fbe687b0
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile.in
View file

@ -287,7 +287,6 @@ include $(S)mk/clean.mk
.DEFAULT_GOAL := all .DEFAULT_GOAL := all
.PHONY: all .PHONY: all
all: servo servo-embedding
# Servo helper libraries # Servo helper libraries
@ -338,6 +337,7 @@ $(BINDINGS_SRC)/ParserResults.pkl: $(globalgen_dependencies) \
# Servo binaries # Servo binaries
ifneq ($(CFG_OSTYPE),linux-androideabi) ifneq ($(CFG_OSTYPE),linux-androideabi)
all: servo servo-embedding
servo: $(DEPS_servo) servo: $(DEPS_servo)
@$(call E, compile: $@) @$(call E, compile: $@)
$(Q)$(RUSTC) $(RFLAGS_servo) -o servo $< --crate-type bin $(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) $(Q)$(RUSTC) $(RFLAGS_embedding) $(CRATE_embedding)
touch servo-embedding touch servo-embedding
else else
all: servo
servo: $(DEPS_servo) servo: $(DEPS_servo)
@$(call E, compile: $@) @$(call E, compile: $@)
$(Q)$(RUSTC) $(RFLAGS_servo) $< -o libservo.so --crate-type dylib $(Q)$(RUSTC) $(RFLAGS_servo) $< -o libservo.so --crate-type dylib