diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2020-03-21 08:51:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-21 08:51:15 +0100 |
| commit | bbd1ca3b69efc500eaadc11146506815c98ed93e (patch) | |
| tree | a20530b5eda7eab237db85e5cb66310de27cd182 /src | |
| parent | 0b99489a89a10b5bd4e69ca9d9c32d03582c4aea (diff) | |
| parent | 50c0562319979245f45bb180d1eaa1b7d424630e (diff) | |
| download | rust-bbd1ca3b69efc500eaadc11146506815c98ed93e.tar.gz rust-bbd1ca3b69efc500eaadc11146506815c98ed93e.zip | |
Rollup merge of #70054 - rojamd:android-pgo, r=michaelwoerister
Build dist-android with --enable-profiler This will make the runtime available to enable PGO for Rust code in Firefox on Android. r? @michaelwoerister
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/dist-android/Dockerfile | 1 | ||||
| -rw-r--r-- | src/libprofiler_builtins/build.rs | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/docker/dist-android/Dockerfile b/src/ci/docker/dist-android/Dockerfile index a54a2d003b6..64f31750dd7 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 \ diff --git a/src/libprofiler_builtins/build.rs b/src/libprofiler_builtins/build.rs index 8adcff67800..c990b289335 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")); |