mirror of
https://github.com/servo/servo.git
synced 2025-08-02 20:20:14 +01:00
auto merge of #1260 : metajack/servo/kmcallister-rustpkg, r=metajack,me
Rebased from @kmcallister's branch to fix mac platform issues.
This commit is contained in:
commit
d2cfb65127
26 changed files with 161 additions and 96 deletions
29
configure
vendored
29
configure
vendored
|
@ -399,6 +399,7 @@ probe CFG_CLANG clang++
|
|||
|
||||
CFG_BUILD_DIR="${CFG_BUILD_HOME}${CFG_TARGET_TRIPLES}/"
|
||||
make_dir "${CFG_BUILD_DIR}"
|
||||
make_dir "${CFG_BUILD_HOME}/workspace/src"
|
||||
|
||||
if [ ! -z "$CFG_LOCAL_RUST_ROOT" ]
|
||||
then
|
||||
|
@ -407,6 +408,7 @@ then
|
|||
LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc --version`
|
||||
step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: $LRV"
|
||||
CFG_RUSTC=${CFG_LOCAL_RUST_ROOT}/bin/rustc
|
||||
CFG_RUSTPKG=${CFG_LOCAL_RUST_ROOT}/bin/rustpkg
|
||||
CFG_RUST_HOME=${CFG_LOCAL_RUST_ROOT}
|
||||
CFG_LOCAL_RUSTC=1
|
||||
else
|
||||
|
@ -416,6 +418,7 @@ else
|
|||
step_msg "using in-tree rust compiler"
|
||||
# The Rust compiler we're going to build
|
||||
CFG_RUSTC="${CFG_BUILD_DIR}src/compiler/rust/${DEFAULT_TARGET_TRIPLE}/stage2/bin/rustc"
|
||||
CFG_RUSTPKG="${CFG_BUILD_DIR}src/compiler/rust/${DEFAULT_TARGET_TRIPLE}/stage2/bin/rustpkg"
|
||||
CFG_RUST_HOME="${CFG_BUILD_DIR}src/compiler/rust/${DEFAULT_TARGET_TRIPLE}/stage2"
|
||||
fi
|
||||
|
||||
|
@ -482,21 +485,23 @@ then
|
|||
done
|
||||
fi
|
||||
|
||||
CFG_SUBMODULES_RUSTPKG="\
|
||||
support/geom/rust-geom \
|
||||
support/layers/rust-layers \
|
||||
support/opengles/rust-opengles \
|
||||
support/sharegl/sharegl"
|
||||
|
||||
CFG_SUBMODULES="\
|
||||
support/alert/rust-alert \
|
||||
support/azure/rust-azure \
|
||||
support/css/rust-cssparser \
|
||||
support/geom/rust-geom \
|
||||
support/harfbuzz/rust-harfbuzz \
|
||||
support/http/rust-http \
|
||||
support/hubbub/libhubbub \
|
||||
support/hubbub/rust-hubbub \
|
||||
support/layers/rust-layers \
|
||||
support/libparserutils/libparserutils \
|
||||
support/nss/nspr \
|
||||
support/nss/nss \
|
||||
support/opengles/rust-opengles \
|
||||
support/sharegl/sharegl \
|
||||
support/skia/skia \
|
||||
support/spidermonkey/mozjs \
|
||||
support/spidermonkey/rust-mozjs \
|
||||
|
@ -506,25 +511,29 @@ CFG_SUBMODULES="\
|
|||
|
||||
if [ $CFG_OSTYPE = "apple-darwin" ]
|
||||
then
|
||||
CFG_SUBMODULES="\
|
||||
support/glfw/glfw \
|
||||
support/glfw/glfw-rs \
|
||||
platform/macos/rust-cocoa \
|
||||
CFG_SUBMODULES_RUSTPKG="\
|
||||
platform/macos/rust-core-foundation \
|
||||
platform/macos/rust-core-graphics \
|
||||
platform/macos/rust-core-text \
|
||||
platform/macos/rust-io-surface \
|
||||
${CFG_SUBMODULES_RUSTPKG}"
|
||||
CFG_SUBMODULES="\
|
||||
support/glfw/glfw \
|
||||
support/glfw/glfw-rs \
|
||||
platform/macos/rust-cocoa \
|
||||
${CFG_SUBMODULES}"
|
||||
fi
|
||||
|
||||
if [ $CFG_OSTYPE = "unknown-linux-gnu" ]
|
||||
then
|
||||
CFG_SUBMODULES_RUSTPKG="\
|
||||
platform/linux/rust-xlib \
|
||||
${CFG_SUBMODULES_RUSTPKG}"
|
||||
CFG_SUBMODULES="\
|
||||
support/glfw/glfw \
|
||||
support/glfw/glfw-rs \
|
||||
platform/linux/rust-fontconfig \
|
||||
platform/linux/rust-freetype \
|
||||
platform/linux/rust-xlib \
|
||||
${CFG_SUBMODULES}"
|
||||
fi
|
||||
|
||||
|
@ -550,8 +559,10 @@ putvar CFG_BUILD_HOME
|
|||
putvar CFG_BUILD_DIR
|
||||
putvar CFG_CONFIGURE_ARGS
|
||||
putvar CFG_SUBMODULES
|
||||
putvar CFG_SUBMODULES_RUSTPKG
|
||||
putvar CFG_DISABLE_MANAGE_SUBMODULES
|
||||
putvar CFG_RUSTC
|
||||
putvar CFG_RUSTPKG
|
||||
putvar CFG_RUSTC_FLAGS
|
||||
putvar CFG_RUST_HOME
|
||||
putvar CFG_PATH
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue