From 28e88efada2ae62cecf51b29ea52c69d842db051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Mon, 18 Nov 2019 09:16:20 +0100 Subject: [PATCH] make update: sync and update submodules twice to support changing the URL of a submodule's submodule without having to explain to users why they need to run `make update` twice. --- makefiles/targets.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefiles/targets.mk b/makefiles/targets.mk index eab9fc4..2f2f020 100644 --- a/makefiles/targets.mk +++ b/makefiles/targets.mk @@ -65,6 +65,9 @@ $(NIM_BINARY) update-common: | sanity-checks git reset --hard -q HEAD git submodule sync --quiet --recursive export GIT_LFS_SKIP_SMUDGE=1; git submodule update --init --recursive + # changing URLs in a submodule's submodule means we have to sync and update twice + git submodule sync --quiet --recursive + export GIT_LFS_SKIP_SMUDGE=1; git submodule update --init --recursive rm -rf $(NIMBLE_DIR) + $(MAKE) build-nim