diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-25 16:48:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-25 16:48:33 -0500 |
| commit | 2746c476d3114d987b153d93bed2d302ba2e52a5 (patch) | |
| tree | f60d68c3d9548c554097126eb40969753f1b375d /components | |
| parent | f5d589876b53f2a65e001525487dc6acb5aec088 (diff) | |
| parent | d8c0b87eb20f5c8e511ea920358d51c5199ccfab (diff) | |
| download | servo-2746c476d3114d987b153d93bed2d302ba2e52a5.tar.gz servo-2746c476d3114d987b153d93bed2d302ba2e52a5.zip | |
Auto merge of #11967 - metajack:windows-package, r=larsbergstrom
Add Windows packaging to create an MSI installer
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they require manual testing
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11967)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/servo/.cargo/config | 3 | ||||
| -rw-r--r-- | components/servo/fake-ld.cmd | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/components/servo/.cargo/config b/components/servo/.cargo/config index dffe440072c..1cea095353f 100644 --- a/components/servo/.cargo/config +++ b/components/servo/.cargo/config @@ -9,3 +9,6 @@ ar = "arm-linux-gnueabihf-ar" [target.aarch64-unknown-linux-gnu] linker = "aarch64-linux-gnu-gcc" ar = "aarch64-linux-gnu-ar" + +[target.'cfg(target_os=windows)'] +linker = "./fake-ld.cmd"
\ No newline at end of file diff --git a/components/servo/fake-ld.cmd b/components/servo/fake-ld.cmd new file mode 100644 index 00000000000..b13c7e818ab --- /dev/null +++ b/components/servo/fake-ld.cmd @@ -0,0 +1,2 @@ +@echo off +gcc -mwindows %* |