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

CEF: use cargo rustc -C link-args=... instead of #[link_args="..."]

Browse source 
The latter is an unstable feature that might be changed or removed.
This commit is contained in:
Simon Sapin 2017-10-16 11:12:51 +02:00
parent 9b82d08dc5
commit 06f64c196f
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ports/cef/lib.rs
View file

@ -4,7 +4,6 @@
#![allow(non_camel_case_types)] #![allow(non_camel_case_types)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
#![feature(link_args)]
#[macro_use] #[macro_use]
extern crate log; extern crate log;
@ -27,10 +26,6 @@ extern crate webrender_api;
extern crate libc; extern crate libc;
#[cfg(target_os="macos")]
#[link_args="-Xlinker -undefined -Xlinker dynamic_lookup"]
extern { }
#[cfg(target_os="macos")] #[cfg(target_os="macos")]
extern crate cocoa; extern crate cocoa;
#[cfg(target_os="macos")] #[cfg(target_os="macos")]

10
python/servo/build_commands.py
View file

@ -24,7 +24,7 @@ from mach.decorators import (
Command, Command,
) )
from servo.command_base import CommandBase, cd, call, check_call, BIN_SUFFIX from servo.command_base import CommandBase, cd, call, check_call, BIN_SUFFIX, is_macosx
from servo.util import host_triple from servo.util import host_triple
@ -401,8 +401,14 @@ class MachCommands(CommandBase):
if with_debug_assertions: if with_debug_assertions:
env["RUSTFLAGS"] = "-C debug_assertions" env["RUSTFLAGS"] = "-C debug_assertions"
if is_macosx():
# Unlike RUSTFLAGS, these are only passed in the final rustc invocation
# so that `./mach build` followed by `./mach build-cef` both build
# common dependencies with the same flags.
opts += ["--", "-C", "link-args=-Xlinker -undefined -Xlinker dynamic_lookup"]
with cd(path.join("ports", "cef")): with cd(path.join("ports", "cef")):
ret = call(["cargo", "build"] + opts, ret = call(["cargo", "rustc"] + opts,
env=env, env=env,
verbose=verbose) verbose=verbose)
elapsed = time() - build_start elapsed = time() - build_start