Set counters using LLVM CLI flags

Kobzol · Kobzol · commit 282dec1320e2 · 2023-05-22T19:55:19.000+02:00
diff --git a/src/bootstrap/llvm.rs b/src/bootstrap/llvm.rs
@@ -342,9 +342,10 @@ impl Step for Llvm {
                 cfg.define("LLVM_BUILD_INSTRUMENTED", "IR");
                 if let Ok(llvm_profile_dir) = std::env::var("LLVM_PROFILE_DIR") {
                     cfg.define("LLVM_PROFILE_DATA_DIR", llvm_profile_dir);
+                    cxxflags.push("-mllvm");
+                    cxxflags.push("-vp-counters-per-site=10");
                 }
             }
-            cfg.define("LLVM_VP_COUNTERS_PER_SITE", "10");
             cfg.define("LLVM_BUILD_RUNTIME", "No");
         }
         if let Some(path) = builder.config.llvm_profile_use.as_ref() {

Original file line number	Diff line number	Diff line change
`@@ -342,9 +342,10 @@ impl Step for Llvm {`
`342`	`342`	`cfg.define("LLVM_BUILD_INSTRUMENTED", "IR");`
`343`	`343`	`if let Ok(llvm_profile_dir) = std::env::var("LLVM_PROFILE_DIR") {`
`344`	`344`	`cfg.define("LLVM_PROFILE_DATA_DIR", llvm_profile_dir);`
	`345`	`+ cxxflags.push("-mllvm");`
	`346`	`+ cxxflags.push("-vp-counters-per-site=10");`
`345`	`347`	`}`
`346`	`348`	`}`
`347`		`- cfg.define("LLVM_VP_COUNTERS_PER_SITE", "10");`
`348`	`349`	`cfg.define("LLVM_BUILD_RUNTIME", "No");`
`349`	`350`	`}`
`350`	`351`	`if let Some(path) = builder.config.llvm_profile_use.as_ref() {`