Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #21777 - servo:jdm-patch-29, r=asajeffrey

Browse source 
Fix a mac cross-compilation problem

This fixes one of two problems that prevents cross-compiling for Android on Mac.

<!-- 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/21777)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-09-24 14:15:11 -04:00 • committed by GitHub
commit 483010ec8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/build_commands.py
View file

@ -343,6 +343,7 @@ class MachCommands(CommandBase):
support_include = path.join(env['ANDROID_NDK'], "sources", "android", "support", "include") support_include = path.join(env['ANDROID_NDK'], "sources", "android", "support", "include")
cxx_include = path.join(env['ANDROID_NDK'], "sources", "cxx-stl", cxx_include = path.join(env['ANDROID_NDK'], "sources", "cxx-stl",
"llvm-libc++", "libcxx", "include") "llvm-libc++", "libcxx", "include")
clang_include = path.join(llvm_toolchain, "lib64", "clang", "3.8", "include")
sysroot_include = path.join(env['ANDROID_SYSROOT'], "usr", "include") sysroot_include = path.join(env['ANDROID_SYSROOT'], "usr", "include")
env['HOST_CC'] = host_cc env['HOST_CC'] = host_cc
env['HOST_CXX'] = host_cxx env['HOST_CXX'] = host_cxx
@ -381,6 +382,7 @@ class MachCommands(CommandBase):
"--gcc-toolchain=" + gcc_toolchain, "--gcc-toolchain=" + gcc_toolchain,
"-I" + support_include, "-I" + support_include,
"-I" + cxx_include, "-I" + cxx_include,
"-I" + clang_include,
"-isystem", sysroot_include, "-isystem", sysroot_include,
"-L" + gcc_libs, "-L" + gcc_libs,
"-D__STDC_CONSTANT_MACROS", "-D__STDC_CONSTANT_MACROS",