From f8870bfd63d806daea4e34a161df996a26214712 Mon Sep 17 00:00:00 2001 From: rojamd Date: Mon, 16 Mar 2020 15:29:10 -0400 Subject: [PATCH 1/2] Build dist-android with --enable-profiler --- src/ci/docker/dist-android/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ci/docker/dist-android/Dockerfile b/src/ci/docker/dist-android/Dockerfile index a54a2d003b649..64f31750dd7b6 100644 --- a/src/ci/docker/dist-android/Dockerfile +++ b/src/ci/docker/dist-android/Dockerfile @@ -23,6 +23,7 @@ ENV TARGETS=$TARGETS,x86_64-linux-android ENV RUST_CONFIGURE_ARGS \ --enable-extended \ + --enable-profiler \ --arm-linux-androideabi-ndk=/android/ndk/arm-14 \ --armv7-linux-androideabi-ndk=/android/ndk/arm-14 \ --thumbv7neon-linux-androideabi-ndk=/android/ndk/arm-14 \ From 50c0562319979245f45bb180d1eaa1b7d424630e Mon Sep 17 00:00:00 2001 From: rojamd Date: Wed, 18 Mar 2020 15:55:26 -0400 Subject: [PATCH 2/2] Remove -ffreestanding from libprofiler_builtins because we do need the standard library --- src/libprofiler_builtins/build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libprofiler_builtins/build.rs b/src/libprofiler_builtins/build.rs index 8adcff67800fe..c990b28933504 100644 --- a/src/libprofiler_builtins/build.rs +++ b/src/libprofiler_builtins/build.rs @@ -41,7 +41,6 @@ fn main() { cfg.flag("-fno-builtin"); cfg.flag("-fvisibility=hidden"); cfg.flag("-fomit-frame-pointer"); - cfg.flag("-ffreestanding"); cfg.define("VISIBILITY_HIDDEN", None); if !target.contains("windows") { cfg.define("COMPILER_RT_HAS_UNAME", Some("1"));