diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-01-14 12:59:17 -0600 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-01-14 12:59:17 -0600 |
| commit | de523d8c2149b489a12c453d8e12dd0655ada279 (patch) | |
| tree | 427463a3de7d46f3d1e1d111dbf9b062bf20dbc0 /ACE/include | |
| parent | 86d885f66862d56e9def6212e1c81c25d232a611 (diff) | |
| download | ATCD-de523d8c2149b489a12c453d8e12dd0655ada279.tar.gz | |
Building for Android on Windows
Diffstat (limited to 'ACE/include')
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 1 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_clang_common.GNU | 2 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_common.GNU | 13 |
3 files changed, 11 insertions, 5 deletions
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 24ebf3bb5b4..a41a8a68f10 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -7,6 +7,7 @@ ACE_PLATFORM_CONFIG ?= config-android.h # Common Linux Functionality +linux_is_cross_compiled ?= 1 include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU # as of NDK r6 inlining is required diff --git a/ACE/include/makeinclude/platform_clang_common.GNU b/ACE/include/makeinclude/platform_clang_common.GNU index 51ccc49feda..7aa21c9e77a 100644 --- a/ACE/include/makeinclude/platform_clang_common.GNU +++ b/ACE/include/makeinclude/platform_clang_common.GNU @@ -76,7 +76,7 @@ ifneq ($(DLD),) endif # DLD = CXX_FOR_VERSION_TEST # The -E option is GNU ld specific ifneq ($(mingw32),1) - GNU_LD := $(shell sh -c '$(LD_FOR_VERSION_TEST) -v 2>&1 | grep -c "GNU ld"') + GNU_LD := $(shell $(LD_FOR_VERSION_TEST) -v 2>&1 | grep -c 'GNU ld') else GNU_LD := $(if $(findstring GNU ld,$(shell $(LD_FOR_VERSION_TEST) -v)), 1, 0) endif # mingw32 diff --git a/ACE/include/makeinclude/platform_linux_common.GNU b/ACE/include/makeinclude/platform_linux_common.GNU index 11329332c25..749d3d969a2 100644 --- a/ACE/include/makeinclude/platform_linux_common.GNU +++ b/ACE/include/makeinclude/platform_linux_common.GNU @@ -1,15 +1,18 @@ # -*- Makefile -*- -# We always include config-linux.h on Linux platforms. +# Include config-linux.h by default on Linux platforms. ACE_PLATFORM_CONFIG ?= config-linux.h debug ?= 1 optimize ?= 1 threads ?= 1 insure ?= 0 +linux_is_cross_compiled ?= 0 -LSB_RELEASE_ID := $(shell lsb_release -i 2> /dev/null || echo Distributor ID: Unknown) -LSB_RELEASE_RELEASE := $(shell lsb_release -r 2> /dev/null || echo Release: Unknown) +ifeq($(linux_is_cross_compiled),1) + LSB_RELEASE_ID := $(shell lsb_release -i 2> /dev/null || echo Distributor ID: Unknown) + LSB_RELEASE_RELEASE := $(shell lsb_release -r 2> /dev/null || echo Release: Unknown) +endif PLATFORM_XT_CPPFLAGS= PLATFORM_XT_LIBS=-lXt @@ -113,7 +116,9 @@ ifdef PLATFORM_LARGEFILE_CFLAGS CPPFLAGS += $(PLATFORM_LARGEFILE_CFLAGS) endif -SYSARCH := $(shell uname -m) +ifeq($(linux_is_cross_compiled),1) + SYSARCH := $(shell uname -m) +endif PIC = -fPIC AR ?= ar |