diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-17 23:55:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-17 23:55:57 +0000 |
| commit | 9b0ccb7480a0b86d27bb6c7352b5cd5e79bfbf82 (patch) | |
| tree | 7427aa599f242ae2bb98cf1cfeda7a16d44ce6df /core/binary.mk | |
| parent | 654e39072ecfc0052af0cbfca7e51aa8fc7856e8 (diff) | |
| parent | 741b36e922a09c47507b61cbfc9cd8bba029f476 (diff) | |
| download | build-9b0ccb7480a0b86d27bb6c7352b5cd5e79bfbf82.zip build-9b0ccb7480a0b86d27bb6c7352b5cd5e79bfbf82.tar.gz build-9b0ccb7480a0b86d27bb6c7352b5cd5e79bfbf82.tar.bz2 | |
Merge "Fix the libgcc/libatomic link order."
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/binary.mk b/core/binary.mk index 5f64088..08e290a 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -1009,7 +1009,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_IMPORT_INCLUDES := $(import_includes) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDFLAGS := $(my_ldflags) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDLIBS := $(my_ldlibs) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_CRT := $(strip $(LOCAL_NO_CRT) $(LOCAL_NO_CRT_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))) -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LIBCXX := $(my_libcxx) # this is really the way to get the files onto the command line instead # of using $^, because then LOCAL_ADDITIONAL_DEPENDENCIES doesn't work |