diff options
| author | Fredrik Roubert <roubert@google.com> | 2015-03-04 15:59:00 +0100 |
|---|---|---|
| committer | Fredrik Roubert <roubert@google.com> | 2015-03-19 18:00:10 +0100 |
| commit | 49ecccbe504a3a0164bb431ade9c6a0b331f538a (patch) | |
| tree | 5a28970a6da6769a9497efef8653a68e1b62ee38 /icu4c | |
| parent | b9412307679e543d0b1e10d4e684231f18bc9bc8 (diff) | |
| download | android_external_icu-49ecccbe504a3a0164bb431ade9c6a0b331f538a.tar.gz android_external_icu-49ecccbe504a3a0164bb431ade9c6a0b331f538a.tar.bz2 android_external_icu-49ecccbe504a3a0164bb431ade9c6a0b331f538a.zip | |
Android patch: Add LINKFLAGS to enable setting -rpath options.
This change was introduced in Android by the ICU52 upgrade:
https://android.googlesource.com/platform/external/icu/+/59d709d
Change-Id: I54894decb7b9719006cedcb25a06e076f4fa00f6
Diffstat (limited to 'icu4c')
| -rw-r--r-- | icu4c/source/icudefs.mk.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/icu4c/source/icudefs.mk.in b/icu4c/source/icudefs.mk.in index 7be5a4307..45bb75293 100644 --- a/icu4c/source/icudefs.mk.in +++ b/icu4c/source/icudefs.mk.in @@ -165,8 +165,10 @@ COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c # Commands to link -LINK.c= $(CC) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) +# Markus Scherer (Google) 20070430: Add LINKFLAGS to enable +# setting -rpath options. +LINK.c= $(CC) $(CFLAGS) $(LDFLAGS) $(LINKFLAGS) +LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LINKFLAGS) # Commands to make a shared library SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) |