nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-18 01:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: Cleanup

Browse Source
This commit is contained in:
Brian Anderson 2012-02-29 11:48:29 -08:00
parent 2049d1f05e
commit a7c4c18667
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@ -306,10 +306,11 @@ probe_need CFG_CURL curl
# and shouldn't attempt to load submodules # and shouldn't attempt to load submodules
if [ ! -e ${CFG_SRC_DIR}.git ] if [ ! -e ${CFG_SRC_DIR}.git ]
then then
probe CFG_GIT git
msg "git: no git directory. disabling submodules" msg "git: no git directory. disabling submodules"
CFG_DISABLE_MANAGE_SUBMODULES=1 CFG_DISABLE_MANAGE_SUBMODULES=1
else else
probe_need CFG_GIT git probe_need CFG_GIT git
fi fi
probe CFG_CLANG clang++ probe CFG_CLANG clang++
@ -482,14 +483,6 @@ done
# Configure submodules # Configure submodules
step_msg "configuring submodules" step_msg "configuring submodules"
# If we have no git directory then we are probably a tarball distribution
# and shouldn't attempt to load submodules
if [ ! -e ${CFG_SRC_DIR}.git ]
then
msg "git: no git directory. disabling submodules"
CFG_DISABLE_MANAGE_SUBMODULES=1
fi
# Have to be in the top of src directory for this # Have to be in the top of src directory for this
if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ] if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ]
then then
@ -679,14 +672,8 @@ putvar CFG_PREFIX
putvar CFG_TARGET_TRIPLES putvar CFG_TARGET_TRIPLES
putvar CFG_C_COMPILER putvar CFG_C_COMPILER
putvar CFG_LIBDIR putvar CFG_LIBDIR
putvar CFG_DISABLE_MANAGE_SUBMODULES
# Setting this again because it may have been changed
if [ $CFG_DISABLE_MANAGE_SUBMODULES ]
then
putvar CFG_DISABLE_MANAGE_SUBMODULES
fi
# Ditto for pandoc
if [ ! -z $BAD_PANDOC ] if [ ! -z $BAD_PANDOC ]
then then
CFG_PANDOC= CFG_PANDOC=