Skip to content

Commit 56334d2

Browse files
Use normal toolchain with cbindgen (#57)
* Use normal toolchain with cbindgen. * Turn off macro expansion for telemetry ffi cbindgen These changes allow us to make a release without changing our build infrastructure.
1 parent 48ad681 commit 56334d2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build-profiling-ffi.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ echo "Building tools"
148148
cargo build --package tools --bins
149149

150150
echo "Generating $destdir/include/libdatadog headers..."
151-
rustup run nightly -- cbindgen --crate ddcommon-ffi \
151+
cbindgen --crate ddcommon-ffi \
152152
--config ddcommon-ffi/cbindgen.toml \
153153
--output "$destdir/include/datadog/common.h"
154-
rustup run nightly -- cbindgen --crate "${datadog_profiling_ffi}" \
154+
cbindgen --crate "${datadog_profiling_ffi}" \
155155
--config profiling-ffi/cbindgen.toml \
156156
--output "$destdir/include/datadog/profiling.h"
157-
rustup run nightly -- cbindgen --crate ddtelemetry-ffi \
157+
cbindgen --crate ddtelemetry-ffi \
158158
--config ddtelemetry-ffi/cbindgen.toml \
159159
--output "$destdir/include/datadog/telemetry.h"
160160
./target/debug/dedup_headers "$destdir/include/datadog/common.h" "$destdir/include/datadog/telemetry.h" "$destdir/include/datadog/profiling.h"

ddtelemetry-ffi/cbindgen.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ rename_variants = "ScreamingSnakeCase"
2727
must_use = "DDOG_CHECK_RETURN"
2828

2929
[parse]
30-
expand = ["ddtelemetry-ffi"]
30+
# expand = ["ddtelemetry-ffi"]
3131
parse_deps = true
3232
include = ["ddcommon", "ddtelemetry", "ddcommon-ffi"]

0 commit comments

Comments
 (0)