diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-10 00:32:47 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-10 01:23:46 +0200 |
| commit | 70e5662204c49136f55f347694c2c3f171765407 (patch) | |
| tree | 2df9a0c48776d9fa2e3ffd22cd4627ecea6a03f9 /solenv/inc/tg_shl.mk | |
| parent | aafe4bd7f63ff59b9cde725701ccd0d8868a68bc (diff) | |
We want Android shared objects to have names ending in .so
See my previous commit for rationale.
For Android, bypass the UNIXVERSIONNAMES thing in the dmake build
system.
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index d6bcbc82511b..45477416d595 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -219,7 +219,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .ERRREMOVE: $(SHL$(TNR)VERSIONMAP) .ENDIF # "$(GUI)" != "UNX" .IF "$(UNIXVERSIONNAMES)"!="" -.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX" +.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX" .IF "$(GUI)"=="UNX" SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\" .ENDIF # "$(GUI)"!="UNX" @@ -520,7 +520,7 @@ $(SHL$(TNR)TARGETN) : \ .ENDIF # "$(SHL$(TNR)NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" -.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" +.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" $(COMMAND_ECHO)$(RM) $(LB)/$(SHL$(TNR)TARGETN:b) $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" |