diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 61e89c68822..ed23d8c43ee 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -559,6 +559,8 @@ commands: parameters: prefix: type: string + triplet: + type: string steps: - run: name: Build Profiler NTS @@ -574,9 +576,9 @@ commands: command -v switch-php && switch-php "${PHP_VERSION}" cd profiling echo "${CARGO_TARGET_DIR}" - cargo build --release + RUSTC_BOOTSTRAP=1 cargo rustc -p datadog-php-profiling --release --target "$triplet" -Z build-std=panic_abort,core,std,alloc cd - - cp -v "${CARGO_TARGET_DIR}/release/libdatadog_php_profiling.so" "${prefix}/datadog-profiling.so" + cp -v "${CARGO_TARGET_DIR}/${triplet}/release/libdatadog_php_profiling.so" "${prefix}/datadog-profiling.so" objcopy --compress-debug-sections "${prefix}/datadog-profiling.so" - run: name: Build Profiler ZTS @@ -593,9 +595,9 @@ commands: cd profiling echo "${CARGO_TARGET_DIR}" touch build.rs #make sure `build.rs` gets executed after `switch-php` call - cargo build --release + RUSTC_BOOTSTRAP=1 cargo rustc -p datadog-php-profiling --release --target "$triplet" -Z build-std=panic_abort,core,std,alloc cd - - cp -v "${CARGO_TARGET_DIR}/release/libdatadog_php_profiling.so" "${prefix}/datadog-profiling-zts.so" + cp -v "${CARGO_TARGET_DIR}/{$triplet}/release/libdatadog_php_profiling.so" "${prefix}/datadog-profiling-zts.so" objcopy --compress-debug-sections "${prefix}/datadog-profiling-zts.so" executors: @@ -2883,6 +2885,7 @@ jobs: - <<: *STEP_APPEND_BUILD_ID - build_profiler: prefix: datadog-profiling/<< parameters.triplet >>/lib/php/<< parameters.abi_no >> + triplet: << parameters.triplet >> - persist_to_workspace: root: . paths: diff --git a/Cargo.toml b/Cargo.toml index abc2abc7744..6ce29f782f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,13 +13,11 @@ license = "Apache-2.0" debug = 2 # full debug info [profile.release] -debug = 1 -lto = "thin" +codegen-units = 1 +debug = "line-tables-only" incremental = false +lto = "fat" +panic = "abort" [profile.tracer-release] -debug = 1 # line tables only -lto = true -codegen-units = 1 -panic = "abort" inherits = "release"