Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-28 10:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gdb/compile: Use std::filesystem::remove_all in cleanup"

Browse Source 
This reverts commit 7bba0ad085.

Tom de Vries reported that 7bba0ad085 (gdb/compile: Use
std::filesystem::remove_all in cleanup) broke builds with gcc-7.5.0
which mostly supports c++17, but not std::filesystem[1].  As this change
is not critical, revert it to maintain compatibility.

[1] https://inbox.sourceware.org/gdb-patches/a06e6483-aa2e-4b8a-854f-e369a1e961ea@suse.de/

Change-Id: I58150bd27600c95052bdf1bbbd6b44718a5a0bbf
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31420
Approved-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Lancelot SIX
2024-04-03 15:39:10 +01:00
parent 3d7d77d747
commit f89ae595dd
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gdb/compile/compile.c
View File

@@ -39,9 +39,7 @@
#include "osabi.h"
#include "gdbsupport/gdb_wait.h"
#include "valprint.h"
#include <filesystem>
#include <optional>
#include <system_error>
#include "gdbsupport/gdb_unlinker.h"
#include "gdbsupport/pathstuff.h"
#include "gdbsupport/scoped_ignore_signal.h"
@@ -451,11 +449,15 @@ get_compile_file_tempdir (void)
tempdir_name = xstrdup (tempdir_name);
add_final_cleanup ([] ()
{
std::error_code error;
if (std::filesystem::remove_all (tempdir_name, error)
== static_cast<std::uintmax_t> (-1))
warning (_("Could not remove temporary directory %s (%s)"),
tempdir_name, error.message ().c_str ());
char *zap;
int wstat;
gdb_assert (startswith (tempdir_name, TMP_PREFIX));
zap = concat ("rm -rf ", tempdir_name, (char *) NULL);
wstat = system (zap);
if (wstat == -1 || !WIFEXITED (wstat) || WEXITSTATUS (wstat) != 0)
warning (_("Could not remove temporary directory %s"), tempdir_name);
XDELETEVEC (zap);
});
return tempdir_name;
}