aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-05-08 16:04:26 -0400
committerGitHub <noreply@github.com>2019-05-08 16:04:26 -0400
commitc3a79e871130abfd19905cd595dd4ccedab63316 (patch)
tree574f8fe0bd51c3a8e53334530ddc87941b5e295c /python
parentea71b3522061c48256ab1c5a27fb2db8f2607e0e (diff)
parenta54080749315ba8772db01c3f8b6263349d4aec4 (diff)
downloadservo-c3a79e871130abfd19905cd595dd4ccedab63316.tar.gz
servo-c3a79e871130abfd19905cd595dd4ccedab63316.zip
Auto merge of #23318 - asajeffrey:magicleap-debugmozjs, r=jdm
Fix magicleap debugmozjs <!-- Please describe your changes on the following line: --> These changes get magicleap servo to compile with `--debugmozjs`. --- <!-- 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 - [X] These changes fix #23074 and fix #22069 - [X] These changes do not require tests because we're not building debugmozjs servo for magicleap <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- 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/23318) <!-- Reviewable:end -->
Diffstat (limited to 'python')
-rw-r--r--python/servo/build_commands.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index c40890ff579..674c06245fb 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -212,11 +212,6 @@ class MachCommands(CommandBase):
print("Please specify either --target or --android.")
sys.exit(1)
- # https://github.com/servo/servo/issues/22069
- if debug_mozjs and magicleap:
- print("Please specify either --debug-mozjs or --magicleap.")
- sys.exit(1)
-
if android:
target = self.config["android"]["target"]
@@ -576,6 +571,7 @@ class MachCommands(CommandBase):
env.setdefault("HARFBUZZ_SYS_NO_PKG_CONFIG", "1")
env.setdefault("PKG_CONFIG_ALLOW_CROSS", "1")
env.setdefault("CMAKE_TOOLCHAIN_FILE", path.join(ml_support, "toolchain.cmake"))
+ env.setdefault("_LIBCPP_INLINE_VISIBILITY", "__attribute__((__always_inline__))")
# The Open SSL configuration
env.setdefault("OPENSSL_DIR", path.join(target_path, target, "native", "openssl"))