diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 14:25:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 15:48:53 +0200 |
| commit | 8a3ea757c35a000ea303a11b36692aebc2400ead (patch) | |
| tree | 4712f03edc94684407ad2acc2345e6ee4081066d /solenv | |
| parent | 6af8887b41a8438d29b4743f238be7330516ecbc (diff) | |
Use --with-library-suffix=lo for Android to avoid clash with system ICU
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/libs.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 17d482501dc6..12db54a70e17 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -48,12 +48,17 @@ ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR) ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR) ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR) ICUDATALIB=-licudt$(ICU_MAJOR)$(ICU_MINOR) -.ELSE # "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES" +.ELIF "$(OS)"=="ANDROID" +ICUINLIB=-licui18nlo +ICULELIB=-liculelo +ICUUCLIB=-licuuclo +ICUDATALIB=-licudatalo +.ELSE ICUINLIB=-licui18n ICULELIB=-licule ICUUCLIB=-licuuc ICUDATALIB=-licudata -.ENDIF # "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES" +.ENDIF I18NUTILLIB=-li18nutil$(COMID) I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID) I18NPAPERLIB=-li18npaper$(DLLPOSTFIX) |