mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Update rust-harfbuzz, remove harfbuzz and ragel from the build
This commit is contained in:
parent
4da72b4925
commit
8a4ac15908
2 changed files with 4 additions and 20 deletions
22
Makefile.in
22
Makefile.in
|
@ -87,8 +87,6 @@ CHECK_DEPS += \
|
|||
$(NULL)
|
||||
|
||||
CLEAN_DEPS += \
|
||||
clean-ragel \
|
||||
clean-harfbuzz \
|
||||
clean-rust-harfbuzz \
|
||||
clean-mozjs \
|
||||
clean-rust-mozjs \
|
||||
|
@ -115,17 +113,11 @@ libservo.dummy: $(SERVO_DEPS)
|
|||
servo-test: $(SERVO_DEPS)
|
||||
$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) --test -o $@ $<
|
||||
|
||||
src/ragel/ragel/ragel:
|
||||
$(MAKE) -C src/ragel
|
||||
|
||||
src/harfbuzz/src/.libs/libharfbuzz.a: src/ragel/ragel/ragel
|
||||
$(MAKE) -C src/harfbuzz PATH=$(PATH):$(BUILD_DIR)/src/ragel/ragel CXXFLAGS=-fPIC LDFLAGS="-fPIC -lstdc++"
|
||||
|
||||
src/mozjs/libjs_static.a:
|
||||
$(MAKE) -C src/mozjs
|
||||
|
||||
src/rust-harfbuzz/libharfbuzz.dummy: src/harfbuzz/src/.libs/libharfbuzz.a
|
||||
$(MAKE) -C src/rust-harfbuzz RUSTFLAGS="$(RUSTFLAGS) -L ../harfbuzz/src/.libs/"
|
||||
src/rust-harfbuzz/libharfbuzz.dummy:
|
||||
$(MAKE) -C src/rust-harfbuzz
|
||||
|
||||
src/rust-mozjs/libmozjs.dummy: src/mozjs/libjs_static.a
|
||||
RUSTFLAGS="$(RUSTFLAGS) -L ../mozjs/" CFLAGS="-I../mozjs/dist/include" \
|
||||
|
@ -166,7 +158,7 @@ check-servo: servo-test
|
|||
|
||||
.PHONY: check-rust-harfbuzz
|
||||
check-rust-harfbuzz: src/harfbuzz/src/.libs/libharfbuzz.a
|
||||
$(MAKE) check -C src/rust-harfbuzz RUSTFLAGS="$(RUSTFLAGS) -L ../harfbuzz/src/.libs/"
|
||||
$(MAKE) check -C src/rust-harfbuzz
|
||||
|
||||
.PHONY: check-rust-mozjs
|
||||
check-rust-mozjs: src/mozjs/libjs_static.a
|
||||
|
@ -213,14 +205,6 @@ check-rust-http-client:
|
|||
.PHONY: clean
|
||||
clean: $(CLEAN_DEPS)
|
||||
|
||||
.PHONY: clean-ragel
|
||||
clean-ragel:
|
||||
$(MAKE) clean -C src/ragel
|
||||
|
||||
.PHONY: clean-harfbuzz
|
||||
clean-harfbuzz:
|
||||
$(MAKE) clean -C src/harfbuzz
|
||||
|
||||
.PHONY: clean-rust-harfbuzz
|
||||
clean-rust-harfbuzz:
|
||||
$(MAKE) clean -C src/rust-harfbuzz
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 31a5973898e4c567be2c1dcffb412bb8317228e9
|
||||
Subproject commit a09755c5ed1303c45c1624056c0f3aa67657e80c
|
Loading…
Add table
Add a link
Reference in a new issue