Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 09:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #144 from g2p/master

Browse source 
Fix the mozjs special case so that build products are where rust-mozjs expects them.
This commit is contained in:
Brian Anderson 2012-10-22 18:59:22 -07:00
commit cb5b10c6da
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configure vendored
View file

@ -351,9 +351,6 @@ then
CFG_SUBMODULES="rust-cocoa rust-io-surface rust-core-foundation rust-core-graphics rust-core-text ${CFG_SUBMODULES}" CFG_SUBMODULES="rust-cocoa rust-io-surface rust-core-foundation rust-core-graphics rust-core-text ${CFG_SUBMODULES}"
fi fi
# needed because Spidermonkey configure is in non-standard location
CFG_CONFIGURE_PATHS="${CFG_SUBMODULES} mozjs/js/src/"
step_msg "making build directories" step_msg "making build directories"
cd "${CFG_BUILD_DIR}" cd "${CFG_BUILD_DIR}"
@ -369,13 +366,17 @@ make_dir src/test/ref
# see how Rust's configure script optionally reconfigures the LLVM module. # see how Rust's configure script optionally reconfigures the LLVM module.
step_msg "running submodule configure scripts" step_msg "running submodule configure scripts"
for i in ${CFG_CONFIGURE_PATHS} for i in ${CFG_SUBMODULES}
do do
if [ -d ${CFG_BUILD_DIR}src/${i} ] if [ -d ${CFG_BUILD_DIR}src/${i} ]
then then
cd ${CFG_BUILD_DIR}src/${i} cd ${CFG_BUILD_DIR}src/${i}
fi fi
CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/configure" CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/configure"
# needed because Spidermonkey configure is in non-standard location
if [ $i = mozjs ]; then
CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/js/src/configure"
fi
if [ -f ${CONFIGURE_SCRIPT} ] if [ -f ${CONFIGURE_SCRIPT} ]
then then
sh ${CONFIGURE_SCRIPT} sh ${CONFIGURE_SCRIPT}