Restore the cc_utils crate (#1300)

Restore the cc_utils crate

That crate is not published and only exists as a way to include cc_utils without all the heavy dependencies of ddcommon. (like in spawn_worker build.rs or php_sidecar_mockgen of dd-trace-php.)

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

Co-authored-by: bob.weinand <bob.weinand@datadoghq.com>

Author: bwoebi

Cargo.lock

@@ -33,6 +33,7 @@ members = [
   "ddtelemetry",
   "ddtelemetry-ffi",
   "tools",
+  "tools/cc_utils",
   "tools/sidecar_mockgen",
   "spawn_worker",
   "tests/spawn_from_lib",

Cargo.toml

@@ -1,4 +1,4 @@
-root_name: builder, build_common, tools, datadog-alloc, datadog-crashtracker, ddcommon, ddtelemetry, datadog-ddsketch, datadog-crashtracker-ffi, ddcommon-ffi, datadog-ffe, datadog-ipc, datadog-ipc-macros, tarpc, tarpc-plugins, tinybytes, spawn_worker, datadog-library-config, datadog-library-config-ffi, datadog-live-debugger, datadog-live-debugger-ffi, datadog-profiling, datadog-profiling-protobuf, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-trace-protobuf, datadog-trace-stats, datadog-trace-utils, datadog-trace-normalization, dogstatsd-client, datadog-log, datadog-log-ffi, ddsketch-ffi, ddtelemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, datadog-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
+root_name: builder, build_common, tools, datadog-alloc, datadog-crashtracker, ddcommon, ddtelemetry, datadog-ddsketch, datadog-crashtracker-ffi, ddcommon-ffi, datadog-ffe, datadog-ipc, datadog-ipc-macros, tarpc, tarpc-plugins, tinybytes, spawn_worker, cc_utils, datadog-library-config, datadog-library-config-ffi, datadog-live-debugger, datadog-live-debugger-ffi, datadog-profiling, datadog-profiling-protobuf, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-trace-protobuf, datadog-trace-stats, datadog-trace-utils, datadog-trace-normalization, dogstatsd-client, datadog-log, datadog-log-ffi, ddsketch-ffi, ddtelemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, datadog-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
 third_party_libraries:
 - package_name: addr2line
   package_version: 0.24.2

LICENSE-3rdparty.yml

@@ -13,8 +13,7 @@ fastrand = "2.0.1"
 libc = "0.2"
 
 [build-dependencies]
-cc = "1.0"
-ddcommon = { path = "../ddcommon" }
+cc_utils = { path = "../tools/cc_utils" }
 
 [dependencies.windows]
 features = [

spawn_worker/Cargo.toml

@@ -1,10 +1,10 @@
 // Copyright 2021-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
-pub use ddcommon::cc_utils::cc;
+pub use cc_utils::cc;
 
 fn main() {
-    let mut builder = ddcommon::cc_utils::ImprovedBuild::new();
+    let mut builder = cc_utils::ImprovedBuild::new();
     builder
         .file("src/trampoline.c")
         .warnings(true)
@@ -28,7 +28,7 @@ fn main() {
     builder.try_compile_executable("trampoline.bin").unwrap();
 
     if !cfg!(target_os = "windows") {
-        ddcommon::cc_utils::ImprovedBuild::new()
+        cc_utils::ImprovedBuild::new()
             .file("src/ld_preload_trampoline.c")
             .link_dynamically("dl")
             .warnings(true)
@@ -40,7 +40,7 @@ fn main() {
 
     #[cfg(target_os = "windows")]
     {
-        ddcommon::cc_utils::ImprovedBuild::new()
+        cc_utils::ImprovedBuild::new()
             .file("src/crashtracking_trampoline.cpp") // Path to your C++ file
             .warnings(true)
             .warnings_into_errors(true)

spawn_worker/build.rs

@@ -0,0 +1,14 @@
+[package]
+edition = "2021"
+name = "cc_utils"
+version = "0.1.0"
+
+# Important: This crate is not published and only exists as a way to include cc_utils without all the heavy dependencies of ddcommon. (like in spawn_worker build.rs or php_sidecar_mockgen of dd-trace-php.)
+
+[dependencies]
+anyhow = {version = "1.0"}
+cc = {version = "1.0"}
+
+[lib]
+bench = false
+

tools/cc_utils/Cargo.toml

@@ -0,0 +1 @@
+../../../ddcommon/src/cc_utils.rs

tools/cc_utils/src/lib.rs

@@ -101,6 +101,7 @@ COPY "datadog-trace-utils/Cargo.toml" "datadog-trace-utils/"
 COPY "datadog-trace-stats/Cargo.toml" "datadog-trace-stats/"
 COPY "datadog-tracer-flare/Cargo.toml" "datadog-tracer-flare/"
 COPY "tools/Cargo.toml" "tools/"
+COPY "tools/cc_utils/Cargo.toml" "tools/cc_utils/"
 COPY "tools/sidecar_mockgen/Cargo.toml" "tools/sidecar_mockgen/"
 COPY "spawn_worker/Cargo.toml" "spawn_worker/"
 COPY "tests/spawn_from_lib/Cargo.toml" "tests/spawn_from_lib/"