diff options
| author | David Lifshitz <dlifshitz@macadamian.com> | 2016-08-02 16:30:12 -0400 |
|---|---|---|
| committer | David Lifshitz <dlifshitz@macadamian.com> | 2016-09-11 19:40:20 -0400 |
| commit | 8e8a781442a5ae5e4938a469ac5e8df91f3707bd (patch) | |
| tree | 32f689ea1d5da0cf6186b9ccf5baaf8b930f80bd | |
| parent | a84855c64690c8048fe1a8513c0a8b54af345b4b (diff) | |
| download | ATCD-8e8a781442a5ae5e4938a469ac5e8df91f3707bd.tar.gz | |
BZ-4216 Android build fails when not cross-compiled on Linux
[Changed]
platform_android.GNU
- removed extra comment and include
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 2bbbbe19259..756ba7e2d03 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -9,11 +9,6 @@ no_hidden_visibility ?= 1 # as of NDK r6 inlining is required inline ?= 1 -# start of: include most of platform_linux_common.GNU - -# We always include config-linux.h on Linux platforms. -ACE_PLATFORM_CONFIG ?= config-linux.h - debug ?= 1 optimize ?= 1 threads ?= 1 @@ -125,6 +120,11 @@ AR ?= ar ARFLAGS ?= rsuv RANLIB = @true +PIC = -fPIC +AR ?= ar +ARFLAGS ?= rsuv +RANLIB = @true + # end of: include most of platform_linux_common.GNU #No rwho on Android |