diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-05-16 23:50:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-05-17 00:07:13 +0300 |
| commit | a7098c77b37106e88cd23c9caaf0d31eaa0d5cba (patch) | |
| tree | 1810f5621075b4ad536ded61e6a2c70e9d869a33 /icu/makefile.mk | |
| parent | Fixed ThreadPool (and dependent ORequestThread) life cycle (diff) | |
| download | core-a7098c77b37106e88cd23c9caaf0d31eaa0d5cba.tar.gz core-a7098c77b37106e88cd23c9caaf0d31eaa0d5cba.zip | |
Move the RPATH enforcement to icu4c-rpath.patch and skip that for Android
We might eventually want to use Mike Hommey's "faulty.lib" dynamic
linker (developed for Firefox on Android) to get around the Android
system dynamic linker's silly limitations. It does not like
DT_RPATH. (The Android system dynamic linker just ignores those.) So
no point putting RPATH into the ICU libs for Android.
Note that the faulty.lib linker is not usable currently because it
doesn't like the text relocations that the NDK r8 toolchain generates
for some reason. Sigh.
Change-Id: I9092c6001f0aadbb30e2682e33e7179520846f3b
Diffstat (limited to 'icu/makefile.mk')
| -rw-r--r-- | icu/makefile.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 38bbcddedd93..afedbbce8d1d 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -46,7 +46,6 @@ TARFILE_ROOTDIR=icu PATCH_FILES=\ icu4c-build.patch \ - icu4c-rpath.patch \ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch \ icu4c-wchar_t.patch \ @@ -58,6 +57,9 @@ PATCH_FILES=\ .IF "$(OS)"=="ANDROID" PATCH_FILES+=\ icu4c-android.patch +.ELSE +PATCH_FILES+=\ + icu4c-rpath.patch .ENDIF .IF "$(GUI)"=="UNX" |