diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-12-08 10:29:27 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-08 16:13:12 +0000 |
| commit | 978ccebd8af61417ecdb6d45a31cc68657eee752 (patch) | |
| tree | 83dc5c9da1d8d7e7e45f0322858f0a967652b438 /gn/BUILD.gn | |
| parent | e8ea07a6127971aea8183303b9abfa9856b7a54c (diff) | |
On mips64el, use -B instead of linking .o manually.
These .o are only appropriate for linking executables; others would be used if we link an .so.
-B turns out to be the flag we really wanted here anyway, adding that directory to the search path for all these .o files, letting Clang pick the right one. The existing comment is now correct for both the lib_dirs and ldflags +=.
Change-Id: I66d9aada12477756142726828cf66c142ca76a48
Reviewed-on: https://skia-review.googlesource.com/5657
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gn/BUILD.gn')
| -rw-r--r-- | gn/BUILD.gn | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 79e3e866f2..7af10384a4 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -163,12 +163,7 @@ config("default") { # for /usr/lib64 as $PATH_TO_USR_LIB/../lib64. If there's no /usr/lib, # it can't find /usr/lib64. We must point Clang at /usr/lib64 manually. lib_dirs += [ "$ndk/platforms/$ndk_platform/usr/lib64" ] - ldflags += [ - # Clang will try to link these two files, but not find them. Again, do it manually. - "-nostartfiles", - "$ndk/platforms/$ndk_platform/usr/lib64/crtbegin_dynamic.o", - "$ndk/platforms/$ndk_platform/usr/lib64/crtend_android.o", - ] + ldflags += [ "-B$ndk/platforms/$ndk_platform/usr/lib64" ] } libs = [ |