diff options
| author | Tim Murray <timmurray@google.com> | 2014-07-17 16:38:42 -0700 |
|---|---|---|
| committer | Conley Owens <cco3@android.com> | 2014-08-20 00:48:06 +0000 |
| commit | 92bb84b13fdca9a9d844ac9b209f943eaaf7ae33 (patch) | |
| tree | ca5b7d91aacd6a8709e9a736a760206bf9853a76 /0.153 | |
| parent | 9164caf596265b8359d4061280e751cef680ff0d (diff) | |
| download | android_external_elfutils-92bb84b13fdca9a9d844ac9b209f943eaaf7ae33.tar.gz android_external_elfutils-92bb84b13fdca9a9d844ac9b209f943eaaf7ae33.tar.bz2 android_external_elfutils-92bb84b13fdca9a9d844ac9b209f943eaaf7ae33.zip | |
Update makefiles for clang host builds. DO NOT MERGE
bug 16172793
Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
Diffstat (limited to '0.153')
| -rwxr-xr-x | 0.153/libdw/Android.mk | 3 | ||||
| -rwxr-xr-x | 0.153/libdwfl/Android.mk | 3 | ||||
| -rwxr-xr-x | 0.153/libebl/Android.mk | 4 | ||||
| -rwxr-xr-x | 0.153/libelf/Android.mk | 3 |
4 files changed, 13 insertions, 0 deletions
diff --git a/0.153/libdw/Android.mk b/0.153/libdw/Android.mk index 1d053f6a..111ed6c6 100755 --- a/0.153/libdw/Android.mk +++ b/0.153/libdw/Android.mk @@ -139,6 +139,9 @@ ifeq ($(HOST_OS),darwin) LOCAL_CFLAGS += -fnested-functions endif +# can't build libdw with clang +LOCAL_CLANG := false + LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE -DIS_LIBDW diff --git a/0.153/libdwfl/Android.mk b/0.153/libdwfl/Android.mk index 11573141..4e486ed6 100755 --- a/0.153/libdwfl/Android.mk +++ b/0.153/libdwfl/Android.mk @@ -67,6 +67,9 @@ 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 + # to fix machine-dependent issues LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk index 945ecf48..224c7970 100755 --- a/0.153/libebl/Android.mk +++ b/0.153/libebl/Android.mk @@ -85,6 +85,10 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE +ifeq ($(HOST_OS),darwin) +LOCAL_CFLAGS += -Wno-int-conversion +endif + LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h LOCAL_MODULE:= libebl diff --git a/0.153/libelf/Android.mk b/0.153/libelf/Android.mk index b85e20cd..9dd1b396 100755 --- a/0.153/libelf/Android.mk +++ b/0.153/libelf/Android.mk @@ -154,6 +154,9 @@ ifeq ($(HOST_OS),darwin) LOCAL_CFLAGS += -fnested-functions endif +# can't build libelf with clang +LOCAL_CLANG := false + # to fix machine-dependent issues LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h |