diff options
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux.yml | 4 | ||||
| -rw-r--r-- | BUILDING.md | 2 | ||||
| -rw-r--r-- | GNUmakefile | 4 | ||||
| -rw-r--r-- | flake.nix | 8 | ||||
| -rwxr-xr-x | hooks/post_checkout | 2 | ||||
| m--------- | lib/binaryen | 0 |
7 files changed, 11 insertions, 11 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index d9407119b..1b7d7da06 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ commands: steps: - run: name: "Pull submodules" - command: git submodule update --init + command: git submodule update --init --recursive llvm-source-linux: steps: - restore_cache: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 07c4168e0..b8cc923ee 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -356,13 +356,13 @@ jobs: uses: actions/cache@v3 id: cache-binaryen with: - key: binaryen-linux-${{ matrix.goarch }}-v1 + key: binaryen-linux-${{ matrix.goarch }}-v3 path: build/wasm-opt - name: Build Binaryen if: steps.cache-binaryen.outputs.cache-hit != 'true' run: | sudo apt-get install --no-install-recommends ninja-build - git submodule update --init lib/binaryen + git submodule update --init --recursive lib/binaryen make CROSS=${{ matrix.toolchain }} binaryen - name: Install fpm run: | diff --git a/BUILDING.md b/BUILDING.md index 52e411ec5..efb49c725 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -85,7 +85,7 @@ Now that we have a working static build, it's time to make a release tarball: If you did not clone the repository with the `--recursive` option, you will get errors until you initialize the project submodules: - git submodule update --init + git submodule update --init --recursive The release tarball is stored in build/release.tar.gz, and can be extracted with the following command (for example in ~/lib): diff --git a/GNUmakefile b/GNUmakefile index 9084b145f..aacfe4b7c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -190,7 +190,7 @@ gen-device: gen-device-stm32 endif gen-device-avr: - @if [ ! -e lib/avr/README.md ]; then echo "Submodules have not been downloaded. Please download them using:\n git submodule update --init"; exit 1; fi + @if [ ! -e lib/avr/README.md ]; then echo "Submodules have not been downloaded. Please download them using:\n git submodule update --init --recursive"; exit 1; fi $(GO) build -o ./build/gen-device-avr ./tools/gen-device-avr/ ./build/gen-device-avr lib/avr/packs/atmega src/device/avr/ ./build/gen-device-avr lib/avr/packs/tiny src/device/avr/ @@ -264,7 +264,7 @@ endif .PHONY: wasi-libc wasi-libc: lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a: - @if [ ! -e lib/wasi-libc/Makefile ]; then echo "Submodules have not been downloaded. Please download them using:\n git submodule update --init"; exit 1; fi + @if [ ! -e lib/wasi-libc/Makefile ]; then echo "Submodules have not been downloaded. Please download them using:\n git submodule update --init --recursive"; exit 1; fi cd lib/wasi-libc && $(MAKE) -j4 EXTRA_CFLAGS="-O2 -g -DNDEBUG -mnontrapping-fptoint -msign-ext" MALLOC_IMPL=none CC="$(CLANG)" AR=$(LLVM_AR) NM=$(LLVM_NM) # Check for Node.js used during WASM tests. @@ -18,10 +18,10 @@ # # But you'll need a bit more to make TinyGo actually able to compile code: # -# make llvm-source # fetch compiler-rt -# git submodule update --init # fetch lots of other libraries and SVD files -# make gen-device -j4 # build src/device/*/*.go files -# make wasi-libc # build support for wasi/wasm +# make llvm-source # fetch compiler-rt +# git submodule update --init --recursive # fetch lots of other libraries and SVD files +# make gen-device -j4 # build src/device/*/*.go files +# make wasi-libc # build support for wasi/wasm # # With this, you should have an environment that can compile anything - except # for the Xtensa architecture (ESP8266/ESP32) because support for that lives in diff --git a/hooks/post_checkout b/hooks/post_checkout index 1c6f495cf..71fa8f796 100755 --- a/hooks/post_checkout +++ b/hooks/post_checkout @@ -1,4 +1,4 @@ #!/bin/bash # Docker hub does a recursive clone, then checks the branch out, # so when a PR adds a submodule (or updates it), it fails. -git submodule update --init +git submodule update --init --recursive diff --git a/lib/binaryen b/lib/binaryen -Subproject 96f7acf09aae1ec6e8bc573dfa8f309c4f892a4 +Subproject 11dba9b1c2ad988500b329727f39f4d8786918c |