diff options
| author | Keegan McAllister <kmcallister@mozilla.com> | 2013-11-04 13:03:42 -0800 |
|---|---|---|
| committer | Keegan McAllister <kmcallister@mozilla.com> | 2013-11-14 11:21:08 +0900 |
| commit | db6d25ff13bb9a55e6e88b10c8abced77d6bb132 (patch) | |
| tree | 1945e7886dda2df64be66ed9b597c6c5c7a66ead /configure | |
| parent | 4eb84496211bb48d2804a0ddcd16849536546103 (diff) | |
| download | servo-db6d25ff13bb9a55e6e88b10c8abced77d6bb132.tar.gz servo-db6d25ff13bb9a55e6e88b10c8abced77d6bb132.zip | |
Build some dependencies with rustpkg
Also take a rust-layers bugfix.
In collaboration with Jack Moffitt.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/configure b/configure index 606bb5a1a8d..f3434821052 100755 --- a/configure +++ b/configure @@ -394,6 +394,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 @@ -402,6 +403,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 @@ -411,6 +413,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 @@ -477,21 +480,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 \ @@ -501,25 +506,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 @@ -545,8 +554,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 |