Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Pass Mac OS version cfg flags to rust-opengles build

Browse source 
This was in the rust-opengles Makefile.in pre-rustpkg.
This commit is contained in:
Keegan McAllister 2013-11-14 14:16:21 +09:00
parent db6d25ff13
commit 94937b2f2a
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Makefile.in
View file

@ -216,6 +216,17 @@ include $(S)mk/rustpkg.mk
$(foreach submodule,$(SUBMODULES_RUSTPKG),\ $(foreach submodule,$(SUBMODULES_RUSTPKG),\
$(eval $(call DEF_SUBMODULE_RUSTPKG_RULES,$(submodule)))) $(eval $(call DEF_SUBMODULE_RUSTPKG_RULES,$(submodule))))
# rust-opengles needs some extra build options
ifeq ($(shell uname -s),Darwin)
ifeq ($(shell sw_vers | grep -c 10.6),1)
EXTRA_RFLAGS_rust-opengles += --cfg mac_10_6
endif
ifeq ($(shell sw_vers | grep -c 10.7),1)
EXTRA_RFLAGS_rust-opengles += --cfg mac_10_7
endif
endif
DONE_SUBMODULES = $(foreach submodule,$(SUBMODULES),$(DONE_$(submodule))) DONE_SUBMODULES = $(foreach submodule,$(SUBMODULES),$(DONE_$(submodule)))
DONE_SUBMODULES_RUSTPKG = $(foreach submodule,$(SUBMODULES_RUSTPKG),$(DONE_$(submodule))) DONE_SUBMODULES_RUSTPKG = $(foreach submodule,$(SUBMODULES_RUSTPKG),$(DONE_$(submodule)))

4
mk/rustpkg.mk
View file

@ -10,6 +10,8 @@ $(1) : $$(DONE_$(1))
DO_CLEAN_$(1) = rm -rf $$(DONE_$(1)) $(CFG_BUILD_HOME)/workspace/build/$(CFG_TARGET_TRIPLES)/$(1) DO_CLEAN_$(1) = rm -rf $$(DONE_$(1)) $(CFG_BUILD_HOME)/workspace/build/$(CFG_TARGET_TRIPLES)/$(1)
EXTRA_RFLAGS_$(1) =
clean-$(1) : clean-$(1) :
$$(Q) $$(DO_CLEAN_$(1)) $$(Q) $$(DO_CLEAN_$(1))
.PHONY : clean-$(1) .PHONY : clean-$(1)
@ -18,7 +20,7 @@ clean-$(1) :
$$(DONE_$(1)) : $$(DONE_rust) $$(DONE_DEPS_$(1)) $$(ROUGH_DEPS_$(1)) $$(DONE_$(1)) : $$(DONE_rust) $$(DONE_DEPS_$(1)) $$(ROUGH_DEPS_$(1))
$$(Q) $$(DO_CLEAN_$(1)) $$(Q) $$(DO_CLEAN_$(1))
$$(Q) RUST_PATH=$(CFG_BUILD_HOME)workspace:$(subst $(SPACE),:,$(foreach submodule,$(strip $(CFG_SUBMODULES_RUSTPKG)),$(S)src/$(submodule))) \ $$(Q) RUST_PATH=$(CFG_BUILD_HOME)workspace:$(subst $(SPACE),:,$(foreach submodule,$(strip $(CFG_SUBMODULES_RUSTPKG)),$(S)src/$(submodule))) \
$(CFG_RUSTPKG) --rust-path-hack install $(CFG_RUSTC_FLAGS) $(1) $(CFG_RUSTPKG) --rust-path-hack install $(CFG_RUSTC_FLAGS) $$(EXTRA_RFLAGS_$(1)) $(1)
endef endef