Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-19 22:59:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

explicitly specify bitness for x86 cross-compilation situations

Browse source 
Despite compiling for architecture X, the user may have specified a
clang that defaults to architecture Y.  We need to ensure that we invoke
clang with the correct architecture selection.  We do not use --target
to do this, however, because that runs into problems with LLVM's default
search paths.  For the x86 case, we can simply use -m$BITNESS to select
the correct architecture.
This commit is contained in:
Nathan Froyd 2017-05-12 14:21:27 -04:00
parent 121662aa57
commit e966d976fc
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/build_gecko.rs
View file

@ -153,6 +153,15 @@ mod bindings {
}
if cfg!(target_os = "linux") {
builder = builder.clang_arg("-DOS_LINUX=1");
// We may be cross-compiling with a clang that defaults to
// a different architecture, so we should explicitly specify
// the bitness being used here. Specifying --target instead
// leads to difficulties with LLVM search paths.
if cfg!(target_arch = "x86") {
builder = builder.clang_arg("-m32")
} else if cfg!(target_arch = "x86_64") {
builder = builder.clang_arg("-m64")
}
} else if cfg!(target_os = "solaris") {
builder = builder.clang_arg("-DOS_SOLARIS=1");
} else if cfg!(target_os = "dragonfly") {