From 7eb949eac4417c9f275acd925c76d1fb327c69f5 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 14 Jun 2012 15:09:34 -0700 Subject: [PATCH] Fix build --- Makefile.in | 7 ++++--- src/rust-mozjs | 2 +- src/rust-stb-image | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index c9fc8d44025..c49e71a7385 100644 --- a/Makefile.in +++ b/Makefile.in @@ -95,8 +95,8 @@ src/rust-harfbuzz/libharfbuzz.dummy: src/harfbuzz/src/.libs/libharfbuzz.a $(MAKE) -C src/rust-harfbuzz RUSTFLAGS="-L ../harfbuzz/src/.libs/" src/rust-mozjs/libmozjs.dummy: src/mozjs/libjs_static.a - $(MAKE) -C src/rust-mozjs \ - RUSTFLAGS="-L ../mozjs/" CFLAGS="-I../mozjs/dist/include" + RUSTFLAGS="-L ../mozjs/" CFLAGS="-I../mozjs/dist/include" \ + $(MAKE) -C src/rust-mozjs src/rust-azure/libazure.dummy: $(AZURE_DEPS) RUSTFLAGS="-L ../rust-cocoa" $(MAKE) -C src/rust-azure @@ -124,7 +124,8 @@ check-rust-harfbuzz: src/harfbuzz/src/.libs/libharfbuzz.a .PHONY: check-rust-mozjs check-rust-mozjs: src/mozjs/libjs_static.a - $(MAKE) check -C src/rust-mozjs RUSTFLAGS="-L ../mozjs/" + RUSTFLAGS="-L ../mozjs/" CFLAGS="-I../mozjs/dist/include" \ + $(MAKE) check -C src/rust-mozjs .PHONY: check-rust-azure check-rust-azure: $(AZURE_DEPS) diff --git a/src/rust-mozjs b/src/rust-mozjs index ed52cbf4179..530d8661e52 160000 --- a/src/rust-mozjs +++ b/src/rust-mozjs @@ -1 +1 @@ -Subproject commit ed52cbf4179aef19a5afa507faf140e1152dd6d8 +Subproject commit 530d8661e5282180acd2c3005f4fe7f0c2477f0a diff --git a/src/rust-stb-image b/src/rust-stb-image index 73229f656e7..5eb1ee67bc9 160000 --- a/src/rust-stb-image +++ b/src/rust-stb-image @@ -1 +1 @@ -Subproject commit 73229f656e75517c3906eb20ba1a48e8df3d2584 +Subproject commit 5eb1ee67bc91d5e52a8810341b057211fbe5cb97