diff options
| author | <wangying@google.com> | 2011-02-10 10:43:43 -0800 |
|---|---|---|
| committer | <wangying@google.com> | 2011-02-10 10:43:43 -0800 |
| commit | d6b3177dc8485100a3501a81731a1afbffee8041 (patch) | |
| tree | 0ce344eb62ec4eb66a2b1ca49900f7bf32ca54a0 /Android.mk | |
| parent | 545813738cad7083ce736912c82ad4587cbce489 (diff) | |
| download | valgrind-d6b3177dc8485100a3501a81731a1afbffee8041.tar.gz | |
Fix x86 build.
The prebuilt x86 linker does not know the option --build-id.
Change-Id: I2ae6f60dc15fbab8413738c4cc300253ae4aaa63
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index fa3910852..1def27fbf 100644 --- a/Android.mk +++ b/Android.mk @@ -39,7 +39,11 @@ common_includes := \ vex_ldflags := -nodefaultlibs +ifeq ($(TARGET_ARCH),arm) tool_ldflags := -static -Wl,--build-id=none,-Ttext=0x38000000 -nodefaultlibs -nostartfiles -u _start -e_start +else +tool_ldflags := -static -Wl,-Ttext=0x38000000 -nodefaultlibs -nostartfiles -u _start -e_start +endif preload_ldflags := -nodefaultlibs -Wl,-z,interpose,-z,initfirst @@ -623,4 +627,3 @@ LOCAL_SRC_FILES := bionic.supp include $(BUILD_PREBUILT) endif - |