diff options
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/bootstrap.py | 8 | ||||
| -rw-r--r-- | python/servo/build_commands.py | 6 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index 28292ea3510..0b5da09501d 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -124,7 +124,7 @@ def linux(context, force=False): 'ccache', 'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel', 'gstreamer1-plugins-base-devel', 'gstreamer1-plugins-bad-free-devel', 'autoconf213'] if context.distro == "Ubuntu": - if context.distro_version == "17.04": + if context.distro_version in ["17.04", "19.04"]: pkgs_apt += ["libssl-dev"] elif int(context.distro_version.split(".")[0]) < 17: pkgs_apt += ["libssl-dev"] @@ -384,14 +384,16 @@ def get_linux_distribution(): base_version = '10.10' else: raise Exception('unsupported version of %s: %s' % (distro, version)) - distro, version = 'Ubuntu', base_version + elif distro.lower() == 'ubuntu': + if version > '19.04': + raise Exception('unsupported version of %s: %s' % (distro, version)) + # Fixme: we should allow checked/supported versions only elif distro.lower() not in [ 'centos', 'centos linux', 'debian', 'fedora', - 'ubuntu', ]: raise Exception('mach bootstrap does not support %s, please file a bug' % distro) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 3b01ebaa074..abe4e1003f9 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")) diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 8ff1170872d..12ab0607a3a 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -546,7 +546,11 @@ class PackageCommands(CommandBase): import boto3 def get_taskcluster_secret(name): - url = os.environ["TASKCLUSTER_PROXY_URL"] + "/secrets/v1/secret/project/servo/" + name + url = ( + os.environ.get("TASKCLUSTER_PROXY_URL", "http://taskcluster") + + "/secrets/v1/secret/project/servo/" + + name + ) return json.load(urllib.urlopen(url))["secret"] def get_s3_secret(): |