diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-22 05:09:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 05:09:38 +0000 |
| commit | 540b4d7df671f718cd39240f34615742dbad1103 (patch) | |
| tree | 18cad6ab012a48f7bb925fae5736fa78981751c2 | |
| parent | bf0dfde75b280e868d6d169aec81df0c4d00ff5f (diff) | |
| parent | b0578273a576d83728787091519237681e7197c6 (diff) | |
| download | android_external_elfutils-540b4d7df671f718cd39240f34615742dbad1103.tar.gz android_external_elfutils-540b4d7df671f718cd39240f34615742dbad1103.tar.bz2 android_external_elfutils-540b4d7df671f718cd39240f34615742dbad1103.zip | |
am b0578273: am f73f8d6e: Merge "Stop breaking the Darwin build."
* commit 'b0578273a576d83728787091519237681e7197c6':
Stop breaking the Darwin build.
| -rwxr-xr-x | 0.153/libdw/Android.mk | 6 | ||||
| -rwxr-xr-x | 0.153/libdwfl/Android.mk | 6 | ||||
| -rwxr-xr-x | 0.153/libebl/Android.mk | 2 | ||||
| -rwxr-xr-x | 0.153/libelf/Android.mk | 6 |
4 files changed, 4 insertions, 16 deletions
diff --git a/0.153/libdw/Android.mk b/0.153/libdw/Android.mk index 111ed6c6..f9c02af3 100755 --- a/0.153/libdw/Android.mk +++ b/0.153/libdw/Android.mk @@ -14,7 +14,7 @@ LOCAL_PATH := $(call my-dir) -supported_platforms := linux darwin +supported_platforms := linux cur_platform := $(filter $(HOST_OS),$(supported_platforms)) ifdef cur_platform @@ -135,10 +135,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../libdw \ $(LOCAL_PATH)/../libelf -ifeq ($(HOST_OS),darwin) - LOCAL_CFLAGS += -fnested-functions -endif - # can't build libdw with clang LOCAL_CLANG := false diff --git a/0.153/libdwfl/Android.mk b/0.153/libdwfl/Android.mk index 9d313aa0..46f3b380 100755 --- a/0.153/libdwfl/Android.mk +++ b/0.153/libdwfl/Android.mk @@ -14,7 +14,7 @@ LOCAL_PATH := $(call my-dir) -supported_platforms := linux darwin +supported_platforms := linux cur_platform := $(filter $(HOST_OS),$(supported_platforms)) ifdef cur_platform @@ -68,10 +68,6 @@ LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE # to suppress the "pointer of type ‘void *’ used in arithmetic" warning LOCAL_CFLAGS += -Wno-pointer-arith -ifeq ($(HOST_OS),darwin) - LOCAL_CFLAGS += -fnested-functions -endif - # libdwfl is one of the few libs that will never compile with clang LOCAL_CLANG := false diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk index 224c7970..2b695847 100755 --- a/0.153/libebl/Android.mk +++ b/0.153/libebl/Android.mk @@ -14,7 +14,7 @@ LOCAL_PATH := $(call my-dir) -supported_platforms := linux darwin +supported_platforms := linux cur_platform := $(filter $(HOST_OS),$(supported_platforms)) ifdef cur_platform diff --git a/0.153/libelf/Android.mk b/0.153/libelf/Android.mk index 9dd1b396..76052435 100755 --- a/0.153/libelf/Android.mk +++ b/0.153/libelf/Android.mk @@ -14,7 +14,7 @@ LOCAL_PATH := $(call my-dir) -supported_platforms := linux darwin +supported_platforms := linux cur_platform := $(filter $(HOST_OS),$(supported_platforms)) ifdef cur_platform @@ -150,10 +150,6 @@ LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE # to suppress the "pointer of type ‘void *’ used in arithmetic" warning LOCAL_CFLAGS += -Wno-pointer-arith -ifeq ($(HOST_OS),darwin) - LOCAL_CFLAGS += -fnested-functions -endif - # can't build libelf with clang LOCAL_CLANG := false |