aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-12-13 23:45:38 +0100
committerLudovic Courtès <ludo@gnu.org>2012-12-13 23:46:33 +0100
commite2a06ddc7a7d5620f7df8397cec714335b548d6a (patch)
tree82c4d50719c6988b34c5c04805dd25598b536659
parent4aa52039a77a0f92ffd02c0da1dbae968693ca5f (diff)
downloadguix-e2a06ddc7a7d5620f7df8397cec714335b548d6a.tar
guix-e2a06ddc7a7d5620f7df8397cec714335b548d6a.tar.gz
build: Have `bootstrap' run all the necessary steps.
* bootstrap: Always run "git submodule init". Run `nix/sync-with-upstream'. Reported by Nikita Karetnikov and Andreas Enge.
-rwxr-xr-xbootstrap7
1 files changed, 3 insertions, 4 deletions
diff --git a/bootstrap b/bootstrap
index e445af2f2c..f34c43dc52 100755
--- a/bootstrap
+++ b/bootstrap
@@ -7,10 +7,9 @@ set -e -x
top_srcdir="$PWD"
export top_srcdir
-if [ ! -d nix-upstream ]
-then
- git submodule init
-fi
+git submodule init
git submodule update
+./nix/sync-with-upstream
+
exec autoreconf -vfi