From 0b72965dbf545aa64eb9d9e33defc36af4e2e42c Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 26 Oct 2022 18:17:49 -0700 Subject: [PATCH] build: update Tracy integration * Update for v0.9 * Enable the memory and callstack integrations by default --- build.zig | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/build.zig b/build.zig index 538549ea91..e439b9cb33 100644 --- a/build.zig +++ b/build.zig @@ -122,8 +122,8 @@ pub fn build(b: *Builder) !void { return; const tracy = b.option([]const u8, "tracy", "Enable Tracy integration. Supply path to Tracy source"); - const tracy_callstack = b.option(bool, "tracy-callstack", "Include callstack information with Tracy data. Does nothing if -Dtracy is not provided") orelse false; - const tracy_allocation = b.option(bool, "tracy-allocation", "Include allocation information with Tracy data. Does nothing if -Dtracy is not provided") orelse false; + const tracy_callstack = b.option(bool, "tracy-callstack", "Include callstack information with Tracy data. Does nothing if -Dtracy is not provided") orelse (tracy != null); + const tracy_allocation = b.option(bool, "tracy-allocation", "Include allocation information with Tracy data. Does nothing if -Dtracy is not provided") orelse (tracy != null); const force_gpa = b.option(bool, "force-gpa", "Force the compiler to use GeneralPurposeAllocator") orelse false; const link_libc = b.option(bool, "force-link-libc", "Force self-hosted compiler to link libc") orelse (enable_llvm or only_c); const sanitize_thread = b.option(bool, "sanitize-thread", "Enable thread-sanitization") orelse false; @@ -378,7 +378,7 @@ pub fn build(b: *Builder) !void { if (tracy) |tracy_path| { const client_cpp = fs.path.join( b.allocator, - &[_][]const u8{ tracy_path, "TracyClient.cpp" }, + &[_][]const u8{ tracy_path, "public", "TracyClient.cpp" }, ) catch unreachable; // On mingw, we need to opt into windows 7+ to get some features required by tracy. @@ -674,13 +674,12 @@ fn addCxxKnownPath( exe.addObjectFile(path_unpadded); // TODO a way to integrate with system c++ include files here - // cc -E -Wp,-v -xc++ /dev/null + // c++ -E -Wp,-v -xc++ /dev/null if (need_cpp_includes) { // I used these temporarily for testing something but we obviously need a // more general purpose solution here. - //exe.addIncludePath("/nix/store/fvf3qjqa5qpcjjkq37pb6ypnk1mzhf5h-gcc-9.3.0/lib/gcc/x86_64-unknown-linux-gnu/9.3.0/../../../../include/c++/9.3.0"); - //exe.addIncludePath("/nix/store/fvf3qjqa5qpcjjkq37pb6ypnk1mzhf5h-gcc-9.3.0/lib/gcc/x86_64-unknown-linux-gnu/9.3.0/../../../../include/c++/9.3.0/x86_64-unknown-linux-gnu"); - //exe.addIncludePath("/nix/store/fvf3qjqa5qpcjjkq37pb6ypnk1mzhf5h-gcc-9.3.0/lib/gcc/x86_64-unknown-linux-gnu/9.3.0/../../../../include/c++/9.3.0/backward"); + //exe.addIncludePath("/nix/store/2lr0fc0ak8rwj0k8n3shcyz1hz63wzma-gcc-11.3.0/include/c++/11.3.0"); + //exe.addIncludePath("/nix/store/2lr0fc0ak8rwj0k8n3shcyz1hz63wzma-gcc-11.3.0/include/c++/11.3.0/x86_64-unknown-linux-gnu"); } }