Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-22 16:18:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Set cfg flags on all rust packages.

Browse source
This commit is contained in:
Jack Moffitt 2013-11-19 16:04:17 -07:00
parent 4e1afca6bd
commit e4d9db6ae8
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Makefile.in
View file

@ -216,17 +216,6 @@ 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)))

10
mk/rustpkg.mk
View file

@ -12,6 +12,16 @@ DO_CLEAN_$(1) = rm -rf $$(DONE_$(1)) $(CFG_BUILD_HOME)/workspace/build/$(CFG_TAR
EXTRA_RFLAGS_$(1) = EXTRA_RFLAGS_$(1) =
ifeq ($(shell uname -s),Darwin)
ifeq ($(shell sw_vers | grep -c 10.6),1)
EXTRA_RFLAGS_$(1) += --cfg mac_10_6
endif
ifeq ($(shell sw_vers | grep -c 10.7),1)
EXTRA_RFLAGS_$(1) += --cfg mac_10_7
endif
else
endif
clean-$(1) : clean-$(1) :
$$(Q) $$(DO_CLEAN_$(1)) $$(Q) $$(DO_CLEAN_$(1))
.PHONY : clean-$(1) .PHONY : clean-$(1)