diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-06-17 11:15:44 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-06-17 11:17:15 +0300 |
commit | a074ee056a8b73fc14724522a5c0d1c34850c529 (patch) | |
tree | 4edb96f7bc0783954ccc6f303e4b863feb490569 /Repository.mk | |
parent | 919684989da543d8884bb68d7d1c33c2cbe8a9b7 (diff) |
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
Diffstat (limited to 'Repository.mk')
-rw-r--r-- | Repository.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 347304633808..51089bb27402 100644 --- a/Repository.mk +++ b/Repository.mk @@ -119,10 +119,8 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(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 $(filter-out IOS,$(OS)), \ - regmerge \ - regview \ - ) \ + regmerge \ + regview \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) |