diff options
| author | Kito Cheng <kito.cheng@sifive.com> | 2022-11-16 09:49:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-16 09:49:41 +0800 |
| commit | d9219c0da45aafeab7747accbe6701dbba7e1915 (patch) | |
| tree | bd63d9728ce1d2f274eb4c33f4efcc15bccaea0a | |
| parent | 19688bc7e0ecc16f01442ccb62a88f0864f12e47 (diff) | |
| parent | 6693dba30a7c09920de3575c0f07be2536ee7cc6 (diff) | |
| download | riscv-gnu-toolchain-d9219c0da45aafeab7747accbe6701dbba7e1915.zip riscv-gnu-toolchain-d9219c0da45aafeab7747accbe6701dbba7e1915.tar.gz riscv-gnu-toolchain-d9219c0da45aafeab7747accbe6701dbba7e1915.tar.bz2 | |
Merge pull request #1144 from florianhofhammer/master2022.11.16
musl: add missing submodule auto-initialization
| -rw-r--r-- | .github/workflows/build.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/nightly-release.yaml | 2 | ||||
| -rw-r--r-- | Makefile.in | 10 |
3 files changed, 10 insertions, 4 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6481c87..1139913 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, ubuntu-20.04] + os: [ubuntu-20.04, ubuntu-22.04] mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] exclude: diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index b8449e4..011b453 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -48,7 +48,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, ubuntu-20.04] + os: [ubuntu-20.04, ubuntu-22.04] mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] exclude: diff --git a/Makefile.in b/Makefile.in index 7a6f409..455a378 100644 --- a/Makefile.in +++ b/Makefile.in @@ -252,6 +252,12 @@ else GLIBC_SRC_GIT := endif +ifeq ($(findstring $(srcdir),$(MUSL_SRCDIR)),$(srcdir)) +MUSL_SRC_GIT := $(MUSL_SRCDIR)/.git +else +MUSL_SRC_GIT := +endif + ifeq ($(findstring $(srcdir),$(QEMU_SRCDIR)),$(srcdir)) QEMU_SRC_GIT := $(QEMU_SRCDIR)/.git else @@ -742,7 +748,7 @@ stamps/build-gcc-musl-stage1: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-binutils $(MAKE) -C $(notdir $@) inhibit-libc=true install-target-libgcc mkdir -p $(dir $@) && touch $@ -stamps/build-musl-linux-headers: $(MUSL_SRCDIR) stamps/build-gcc-musl-stage1 +stamps/build-musl-linux-headers: $(MUSL_SRCDIR) $(MUSL_SRC_GIT) stamps/build-gcc-musl-stage1 rm -rf $@ $(notdir $@) mkdir $(notdir $@) cd $(notdir $@) && CC="$(MUSL_CC_FOR_TARGET)" $</configure \ @@ -755,7 +761,7 @@ stamps/build-musl-linux-headers: $(MUSL_SRCDIR) stamps/build-gcc-musl-stage1 $(MAKE) -C $(notdir $@) install-headers mkdir -p $(dir $@) && touch $@ -stamps/build-musl-linux: $(MUSL_SRCDIR) stamps/build-gcc-musl-stage1 +stamps/build-musl-linux: $(MUSL_SRCDIR) $(MUSL_SRC_GIT) stamps/build-gcc-musl-stage1 rm -rf $@ $(notdir $@) mkdir $(notdir $@) cd $(notdir $@) && \ |