Author: Jason Molenda Date: 2023-02-28T13:37:03-08:00 New Revision: b22dcaf113280278293639a02207edf78d103fb8
URL: https://github.com/llvm/llvm-project/commit/b22dcaf113280278293639a02207edf78d103fb8 DIFF: https://github.com/llvm/llvm-project/commit/b22dcaf113280278293639a02207edf78d103fb8.diff LOG: Update debugserver xcode proj to build with c++17 Also a few small fixes for building debugserver on iOS in c++17. Added: Modified: lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj lldb/tools/debugserver/source/MacOSX/MachProcess.mm Removed: ################################################################################ diff --git a/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj b/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj index 1ff26818a7eb8..4c18f73339368 100644 --- a/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj +++ b/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj @@ -490,7 +490,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/bin/sh -x"; - shellScript = "if [ \"${CONFIGURATION}\" != BuildAndIntegration ]\nthen\n if [ -n \"${DEBUGSERVER_USE_FROM_SYSTEM}\" ]\n then\n\t\tditto \"${DEVELOPER_DIR}/../SharedFrameworks/LLDB.framework/Resources/debugserver\" \"${TARGET_BUILD_DIR}/${TARGET_NAME}\"\n elif [ \"${DEBUGSERVER_DISABLE_CODESIGN}\" == \"\" ]\n then\n codesign -f -s lldb_codesign --entitlements ${SRCROOT}/../../resources/debugserver-macosx-entitlements.plist \"${TARGET_BUILD_DIR}/${TARGET_NAME}\"\n fi\nfi\n"; + shellScript = "if [ \"${CONFIGURATION}\" != BuildAndIntegration ]\nthen\n if [ -n \"${DEBUGSERVER_USE_FROM_SYSTEM}\" ]\n then\n\t\tditto \"${DEVELOPER_DIR}/../SharedFrameworks/LLDB.framework/Resources/debugserver\" \"${TARGET_BUILD_DIR}/${TARGET_NAME}\"\n elif [ \"${DEBUGSERVER_DISABLE_CODESIGN}\" == \"\" ]\n then\n codesign -f -s lldb_codesign --entitlements ${SRCROOT}/resources/debugserver-macosx-entitlements.plist \"${TARGET_BUILD_DIR}/${TARGET_NAME}\"\n fi\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -664,7 +664,7 @@ 26CE0596115C31C30022F371 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; "CODE_SIGN_ENTITLEMENTS[sdk=*]" = "source/debugserver-entitlements.plist"; "CODE_SIGN_ENTITLEMENTS[sdk=macosx*]" = "source/debugserver-macosx-entitlements.plist"; @@ -764,7 +764,7 @@ 26CE0597115C31C30022F371 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; "CODE_SIGN_ENTITLEMENTS[sdk=*]" = "source/debugserver-entitlements.plist"; "CODE_SIGN_ENTITLEMENTS[sdk=macosx*]" = "source/debugserver-macosx-entitlements.plist"; diff --git a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm index d524a49defb90..91ef986f48f56 100644 --- a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm +++ b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm @@ -3267,7 +3267,7 @@ static bool mach_header_validity_test(uint32_t magic, uint32_t cputype) { return m_pid; // A successful SBLaunchForDebug() returns and assigns a // non-zero m_pid. } - DNBLog("Failed to launch '%s' with FBS", app_bundle_path); + DNBLog("Failed to launch '%s' with FBS", app_bundle_path.c_str()); } break; #endif #ifdef WITH_BKS @@ -3281,7 +3281,7 @@ static bool mach_header_validity_test(uint32_t magic, uint32_t cputype) { return m_pid; // A successful SBLaunchForDebug() returns and assigns a // non-zero m_pid. } - DNBLog("Failed to launch '%s' with BKS", app_bundle_path); + DNBLog("Failed to launch '%s' with BKS", app_bundle_path.c_str()); } break; #endif #ifdef WITH_SPRINGBOARD @@ -3293,7 +3293,7 @@ static bool mach_header_validity_test(uint32_t magic, uint32_t cputype) { return m_pid; // A successful SBLaunchForDebug() returns and assigns a // non-zero m_pid. } - DNBLog("Failed to launch '%s' with SpringBoard", app_bundle_path); + DNBLog("Failed to launch '%s' with SpringBoard", app_bundle_path.c_str()); } break; #endif _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
