diff --git a/Makefile.in b/Makefile.in index 0e7d46e43c5..48a12933105 100644 --- a/Makefile.in +++ b/Makefile.in @@ -216,17 +216,6 @@ include $(S)mk/rustpkg.mk $(foreach submodule,$(SUBMODULES_RUSTPKG),\ $(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_RUSTPKG = $(foreach submodule,$(SUBMODULES_RUSTPKG),$(DONE_$(submodule))) diff --git a/mk/rustpkg.mk b/mk/rustpkg.mk index 29a1bad8cb5..2088f03ac7e 100644 --- a/mk/rustpkg.mk +++ b/mk/rustpkg.mk @@ -12,6 +12,16 @@ DO_CLEAN_$(1) = rm -rf $$(DONE_$(1)) $(CFG_BUILD_HOME)/workspace/build/$(CFG_TAR 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) : $$(Q) $$(DO_CLEAN_$(1)) .PHONY : clean-$(1)