Kaydet (Commit) a074ee05 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Fix iOS cross-compilation

No idea why the filter-out here was needed at some point in time, but
at least now it broke cross-compilation for iOS.

Change-Id: I6c4d3f6151ac2821db5f79c3e4113400b740f7f3
üst 91968498
...@@ -119,10 +119,8 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ...@@ -119,10 +119,8 @@ $(eval $(call gb_Helper_register_executables,OOO, \
$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
$(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ $(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
$(if $(filter-out IOS,$(OS)), \ regmerge \
regmerge \ regview \
regview \
) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment