From 78689cc810210f803702c79ee9b76bdc5cdb6094 Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Wed, 25 Apr 2018 14:02:54 -0700 Subject: [PATCH] fuchsia: Depend on fdio_config when in-tree Fixes .so link errors from https://logs.chromium.org/v/?s=fuchsia%2Fbuildbucket%2Fcr-buildbucket.appspot.com%2F8948324805139372352%2F%2B%2Fsteps%2Fbuild%2F0%2Fsteps%2Fbuild_fuchsia%2F0%2Fsteps%2Fninja%2F0%2Fstdout [7302/11459] SOLINK x64-shared/crashpad_snapshot_test_module_small.so FAILED: x64-shared/crashpad_snapshot_test_module_small.so x64-shared/lib.unstripped/crashpad_snapshot_test_module_small.so /b/s/w/ir/kitchen-workdir/cipd/goma/gomacc ../../buildtools/linux-x64/clang/bin/clang++ -shared -Wl,--threads --sysroot=/b/s/w/ir/kitchen-workdir/out/debug-x64/zircon_toolchain/obj/zircon/public/sysroot/sysroot --target=x86_64-fuchsia -march=x86-64 -mcx16 -g -Og -Wl,--icf=all -Wl,--no-undefined -o "x64-shared/lib.unstripped/crashpad_snapshot_test_module_small.so" -Wl,-soname="crashpad_snapshot_test_module_small.so" @"x64-shared/crashpad_snapshot_test_module_small.so.rsp" && ../../buildtools/linux-x64/clang/bin/llvm-objcopy --strip-all "x64-shared/lib.unstripped/crashpad_snapshot_test_module_small.so" "x64-shared/crashpad_snapshot_test_module_small.so" /b/s/w/ir/kitchen-workdir/out/debug-x64/../../buildtools/linux-x64/clang/bin/ld.lld: error: undefined symbol: dirfd >>> referenced by directory_reader_posix.cc:72 (../../third_party/crashpad/util/file/directory_reader_posix.cc:72) >>> libutil.directory_reader_posix.o:(crashpad::DirectoryReader::DirectoryFD()) in archive x64-shared/obj/third_party/crashpad/util/libutil.a /b/s/w/ir/kitchen-workdir/out/debug-x64/../../buildtools/linux-x64/clang/bin/ld.lld: error: undefined symbol: fdio_ioctl >>> referenced by sysinfo.h:32 (../../out/debug-x64/zircon_toolchain/obj/zircon/public/sysroot/sysroot/include/zircon/device/sysinfo.h:32) >>> libutil.koid_utilities.o:(ioctl_sysinfo_get_root_job(int, unsigned int*)) in archive x64-shared/obj/third_party/crashpad/util/libutil.a clang-7.0: error: ld.lld command failed with exit code 1 (use -v to see invocation) Bug: crashpad:196 Change-Id: I50b50a8ba668d75d40e86d863976c386bb382f65 Reviewed-on: https://chromium-review.googlesource.com/1028840 Reviewed-by: Joshua Peraza Commit-Queue: Scott Graham --- build/crashpad_buildconfig.gni | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/crashpad_buildconfig.gni b/build/crashpad_buildconfig.gni index c10ad30e..f767027f 100644 --- a/build/crashpad_buildconfig.gni +++ b/build/crashpad_buildconfig.gni @@ -78,6 +78,8 @@ template("crashpad_executable") { if (crashpad_is_in_chromium) { deps += [ "//build/config:exe_and_shlib_deps" ] + } else if (crashpad_is_in_fuchsia) { + configs += [ "//build/config/fuchsia:fdio_config" ] } } } @@ -99,6 +101,8 @@ template("crashpad_loadable_module") { if (crashpad_is_in_chromium) { deps += [ "//build/config:exe_and_shlib_deps" ] + } else if (crashpad_is_in_fuchsia) { + configs += [ "//build/config/fuchsia:fdio_config" ] } } }