bootstrap.sh: fix some issues with a08262384a
This commit is contained in:
parent
a08262384a
commit
5ba478ef5e
11
bootstrap.sh
11
bootstrap.sh
|
@ -381,7 +381,7 @@ bootstrap_fs() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bootstrap_libs_pre() {
|
bootstrap_libs_pre() {
|
||||||
case "$i" in
|
case "$1" in
|
||||||
ldns)
|
ldns)
|
||||||
# This file shouldn't even be in the tree as it's autogenerated
|
# This file shouldn't even be in the tree as it's autogenerated
|
||||||
# during bootstrap, but some people report it breaks the build
|
# during bootstrap, but some people report it breaks the build
|
||||||
|
@ -392,7 +392,7 @@ bootstrap_libs_pre() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bootstrap_libs_post() {
|
bootstrap_libs_post() {
|
||||||
case "$i" in
|
case "$1" in
|
||||||
ldns) (cd $BASEDIR/libs/ldns && mv install-sh~ install-sh) ;;
|
ldns) (cd $BASEDIR/libs/ldns && mv install-sh~ install-sh) ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
@ -406,13 +406,12 @@ bootstrap_libs() {
|
||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
bootstrap_libs_pre
|
bootstrap_libs_pre ${i}
|
||||||
if ! ${BGJOB}; then
|
if ! ${BGJOB}; then
|
||||||
libbootstrap ${i}
|
libbootstrap ${i} ; bootstrap_libs_post ${i}
|
||||||
else
|
else
|
||||||
libbootstrap ${i} &
|
((libbootstrap ${i} ; bootstrap_libs_post ${i}) &)
|
||||||
fi
|
fi
|
||||||
bootstrap_libs_post
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue