diff --git a/.gitmodules b/.gitmodules index 5f05d51..ad08f4b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,13 +3,13 @@ url = https://github.com/status-im/Nim.git ignore = dirty branch = nimbus -[submodule "vendor/Nim-csources"] - path = vendor/Nim-csources - url = https://github.com/nim-lang/csources.git - ignore = dirty - branch = master [submodule "vendor/nimble"] path = vendor/nimble url = https://github.com/nim-lang/nimble.git ignore = dirty branch = master +[submodule "vendor/Nim-csources-v1"] + path = vendor/Nim-csources-v1 + url = https://github.com/nim-lang/csources_v1.git + ignore = untracked + branch = master diff --git a/makefiles/targets.mk b/makefiles/targets.mk index 5a1e715..1298379 100644 --- a/makefiles/targets.mk +++ b/makefiles/targets.mk @@ -78,7 +78,7 @@ build-nim: | sanity-checks MAKE="$(MAKE)" \ ARCH_OVERRIDE=$(ARCH_OVERRIDE) \ QUICK_AND_DIRTY_COMPILER=$(QUICK_AND_DIRTY_COMPILER) \ - "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/build_nim.sh" "$(NIM_DIR)" ../Nim-csources ../nimble "$(CI_CACHE)" + "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/build_nim.sh" "$(NIM_DIR)" ../Nim-csources-v1 ../nimble "$(CI_CACHE)" #- for each submodule, delete checked out files (that might prevent a fresh checkout); skip dotfiles #- in case of submodule URL changes, propagates that change in the parent repo's .git directory diff --git a/vendor/Nim-csources b/vendor/Nim-csources deleted file mode 160000 index f72f471..0000000 --- a/vendor/Nim-csources +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f72f471adb743bea4f8d8c59d19aa1cb885dcc59 diff --git a/vendor/Nim-csources-v1 b/vendor/Nim-csources-v1 new file mode 160000 index 0000000..a8a5241 --- /dev/null +++ b/vendor/Nim-csources-v1 @@ -0,0 +1 @@ +Subproject commit a8a5241f9475099c823cfe1a5e0ca4022ac201ff