diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2018-12-08 14:32:10 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2018-12-08 14:32:10 +0000 |
| commit | 22ef103ecf6cbc897202c1b70bf9a0edabfee146 (patch) | |
| tree | 22e5f978cf56e1aeb14a4411176fccfb293b5f3c | |
| parent | 75cd5ac847bb64526957bd880d360b6102d96452 (diff) | |
Vendor import of libc++ release_70 branch r348686:vendor/libc++/libc++-release_701-r349250vendor/libc++/libc++-release_70-r348686vendor/libc++-70
Notes
Notes:
svn path=/vendor/libc++/dist-release_70/; revision=341733
svn path=/vendor/libc++/libc++-release_701-r349250/; revision=342120; tag=vendor/libc++/libc++-release_701-r349250
| -rw-r--r-- | cmake/Modules/HandleLibCXXABI.cmake | 2 | ||||
| -rw-r--r-- | src/filesystem/operations.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake index ef3b4f5dde22..1c19d7e01af7 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 65a4b319339b..c9396b59cae8 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; |