From 22ef103ecf6cbc897202c1b70bf9a0edabfee146 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 8 Dec 2018 14:32:10 +0000
Subject: Vendor import of libc++ release_70 branch r348686:
 https://llvm.org/svn/llvm-project/libcxx/branches/release_70@348686

---
 cmake/Modules/HandleLibCXXABI.cmake | 2 +-
 src/filesystem/operations.cpp       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake
index ef3b4f5dde221..1c19d7e01af77 100644
--- a/cmake/Modules/HandleLibCXXABI.cmake
+++ b/cmake/Modules/HandleLibCXXABI.cmake
@@ -41,7 +41,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs)
         get_filename_component(ifile ${fpath} NAME)
         set(src ${incpath}/${fpath})
 
-        set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${fpath})
+        set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${ifile})
         add_custom_command(OUTPUT ${dst}
             DEPENDS ${src}
             COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst}
diff --git a/src/filesystem/operations.cpp b/src/filesystem/operations.cpp
index 65a4b319339b5..c9396b59cae8c 100644
--- a/src/filesystem/operations.cpp
+++ b/src/filesystem/operations.cpp
@@ -352,7 +352,6 @@ struct FileDescriptor {
 
   ~FileDescriptor() { close(); }
 
-  FileDescriptor() = default;
   FileDescriptor(FileDescriptor const&) = delete;
   FileDescriptor& operator=(FileDescriptor const&) = delete;
 
-- 
cgit v1.2.3