Skip to content

Commit 1a35a1c

Browse files
committed
Ship profiler with windows-gnu
1 parent f688ba6 commit 1a35a1c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ environment:
104104
DEPLOY: 1
105105
- CI_JOB_NAME: dist-i686-mingw
106106
MSYS_BITS: 32
107-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools
107+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
108108
SCRIPT: python x.py dist
109109
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
110110
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
@@ -114,7 +114,7 @@ environment:
114114
- CI_JOB_NAME: dist-x86_64-mingw
115115
MSYS_BITS: 64
116116
SCRIPT: python x.py dist
117-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools
117+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
118118
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
119119
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
120120
MINGW_DIR: mingw64

src/libprofiler_builtins/build.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ fn main() {
4141
cfg.flag("-fomit-frame-pointer");
4242
cfg.flag("-ffreestanding");
4343
cfg.define("VISIBILITY_HIDDEN", None);
44-
cfg.define("COMPILER_RT_HAS_UNAME", Some("1"));
44+
if !target.contains("windows") {
45+
cfg.define("COMPILER_RT_HAS_UNAME", Some("1"));
46+
} else {
47+
profile_sources.push("WindowsMMap.c");
48+
}
4549
}
4650

4751
// Assume that the Unixes we are building this for have fnctl() available

0 commit comments

Comments
 (0)