aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-02-13 06:09:03 -0800
committerGitHub <noreply@github.com>2017-02-13 06:09:03 -0800
commit5d8870fda9702ed552f7b11f5f772647aa7a6ce1 (patch)
tree090166f2278482e148c9c37e8691c7b3eb4db917
parente394334739635e58bc4d160e9d27bf7217945746 (diff)
parent7afc681ac8ec96932aa90a72e6caf194774f6434 (diff)
downloadservo-5d8870fda9702ed552f7b11f5f772647aa7a6ce1.tar.gz
servo-5d8870fda9702ed552f7b11f5f772647aa7a6ce1.zip
Auto merge of #15529 - jbeich:freebsd, r=emilio
style: unbreak bindgen on BSDs and Solaris <!-- 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: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [x] These changes fix Firefox [bug 1339033](https://bugzilla.mozilla.org/show_bug.cgi?id=1339033) <!-- Either: --> - [x] These changes do not require tests because Tier3 platforms support is incomplete <!-- 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="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15529) <!-- Reviewable:end -->
-rw-r--r--components/style/build_gecko.rs10
1 files changed, 10 insertions, 0 deletions
diff --git a/components/style/build_gecko.rs b/components/style/build_gecko.rs
index 2714a54bfc3..52af2df5a36 100644
--- a/components/style/build_gecko.rs
+++ b/components/style/build_gecko.rs
@@ -136,6 +136,16 @@ mod bindings {
}
if cfg!(target_os = "linux") {
builder = builder.clang_arg("-DOS_LINUX=1");
+ } else if cfg!(target_os = "solaris") {
+ builder = builder.clang_arg("-DOS_SOLARIS=1")
+ } else if cfg!(target_os = "dragonfly") {
+ builder = builder.clang_arg("-DOS_BSD=1").clang_arg("-DOS_DRAGONFLY=1")
+ } else if cfg!(target_os = "freebsd") {
+ builder = builder.clang_arg("-DOS_BSD=1").clang_arg("-DOS_FREEBSD=1")
+ } else if cfg!(target_os = "netbsd") {
+ builder = builder.clang_arg("-DOS_BSD=1").clang_arg("-DOS_NETBSD=1")
+ } else if cfg!(target_os = "openbsd") {
+ builder = builder.clang_arg("-DOS_BSD=1").clang_arg("-DOS_OPENBSD=1")
} else if cfg!(target_os = "macos") {
builder = builder.clang_arg("-DOS_MACOSX=1")
.clang_arg("-stdlib=libc++")