From b17359fe82a2d2b991c143f6513f4d18a7cb28c9 Mon Sep 17 00:00:00 2001 From: xwx1135370 Date: Thu, 7 Nov 2024 11:13:29 +0800 Subject: [PATCH] [BUILD][x86_64-Window-gnu][LLDB] use of undeclared indentifiler `setenv` Issue:https://gitee.com/openharmony/third_party_llvm-project/issues/IB2LPU?from=project-issue Test: Toolchain compilation Signed-off-by: xwx1135370 --- lldb/docs/man/lldb-server.rst | 5 +++-- lldb/tools/lldb-server/lldb-platform.cpp | 10 ++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lldb/docs/man/lldb-server.rst b/lldb/docs/man/lldb-server.rst index bb37dec78feb..e2a613eb6a7f 100644 --- a/lldb/docs/man/lldb-server.rst +++ b/lldb/docs/man/lldb-server.rst @@ -145,8 +145,9 @@ GENERAL OPTIONS .. OHOS_LOCAL begin .. option:: --gdbserver-log-file - Destination file to gdbserver log to. If it is empty and the environment - variable LLDB_DEBUGSERVER_LOG_FILE is also empty, log to stderr. + Only enabled on the OHOS. Destination file to gdbserver log to. + If it is empty and the environment variable LLDB_DEBUGSERVER_LOG_FILE + is also empty, log to stderr. .. OHOS_LOCAL end GDB-SERVER CONNECTIONS diff --git a/lldb/tools/lldb-server/lldb-platform.cpp b/lldb/tools/lldb-server/lldb-platform.cpp index ae233f4dba01..e3626a016a97 100644 --- a/lldb/tools/lldb-server/lldb-platform.cpp +++ b/lldb/tools/lldb-server/lldb-platform.cpp @@ -102,8 +102,12 @@ static void signal_handler(int signo) { static void display_usage(const char *progname, const char *subcommand) { fprintf(stderr, "Usage:\n %s %s [--log-file log-file-name] " - "[--gdbserver-log-file log-file-name] [--log-channels " // OHOS_LOCAL - "log-channel-list] [--port-file port-file-path] --server " + // OHOS_LOCAL begin +#if defined(__OHOS_FAMILY__) + "[--gdbserver-log-file log-file-name] " +#endif + "[--log-channels log-channel-list] [--port-file port-file-path] --server " + // OHOS_LOCAL end "--listen port\n", progname, subcommand); exit(0); @@ -279,6 +283,7 @@ int main_platform(int argc, char *argv[]) { // OHOS_LOCAL begin // The environment variable LLDB_DEBUGSERVER_LOG_FILE is not set // but --gdbserver-log-file is option when starting the lldb-server platform +#if defined(__OHOS_FAMILY__) if (!getenv("LLDB_DEBUGSERVER_LOG_FILE") && !gdbserver_log_file.empty()) { setenv("LLDB_DEBUGSERVER_LOG_FILE", gdbserver_log_file.c_str(), true); } @@ -288,6 +293,7 @@ int main_platform(int argc, char *argv[]) { if (!getenv("LLDB_SERVER_LOG_CHANNELS") && !log_channels.empty()) { setenv("LLDB_SERVER_LOG_CHANNELS", log_channels.str().c_str(), true); } +#endif // OHOS_LOCAL end // Make a port map for a port range that was specified. -- Gitee