Merge pull request #10 from gsoltis/symlink_mingw

Fix llvm-mingw for amd64
vercel · Sep 12, 2022 · 426c25a · 426c25a
2 parents 6a6639d + 44367a9
commit 426c25a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -57,9 +57,12 @@ RUN \
 
 # install a copy of mingw with aarch64 support to enable windows on arm64
 WORKDIR /llvm-mingw
+ARG TARGETARCH
 RUN \
-    wget "https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-20220906-ucrt-ubuntu-18.04-aarch64.tar.xz" && \
-    tar -xvf llvm-mingw-20220906-ucrt-ubuntu-18.04-aarch64.tar.xz
+    if [ ${TARGETARCH} = "arm64" ]; then MINGW_ARCH=aarch64; else MINGW_ARCH=x86_64; fi && \
+    wget "https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-20220906-ucrt-ubuntu-18.04-${MINGW_ARCH}.tar.xz" && \
+    tar -xvf llvm-mingw-20220906-ucrt-ubuntu-18.04-${MINGW_ARCH}.tar.xz && \
+    ln -s llvm-mingw-20220906-ucrt-ubuntu-18.04-${MINGW_ARCH} llvm-mingw
 
 FROM osx-cross-base AS osx-cross
 ARG OSX_CROSS_COMMIT

diff --git a/Makefile b/Makefile
@@ -84,8 +84,6 @@ manifest-create-base:
 manifest-create:
 	@echo "creating manifest $(IMAGE_NAME)"
 	docker manifest create $(IMAGE_NAME) $(foreach arch,$(SUBIMAGES), --amend $(IMAGE_NAME)-$(arch))
-	@echo "creating base manifest $(IMAGE_NAME)-base"
-	docker manifest create $(IMAGE_NAME)-base $(foreach arch,$(SUBIMAGES), --amend $(IMAGE_NAME)-base-$(arch))
 
 .PHONY: manifest-push-base
 manifest-push-base:

diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ with a `PKG_CONFIG_SYSROOT_DIR` set to `/var/target` (same rule apply to `-L`)
 | Linux       | armhf (GOARM=6) | arm-linux-gnueabihf-gcc | arm-linux-gnueabihf-g++ | Verification required |
 | Linux       | armhf (GOARM=7) | arm-linux-gnueabihf-gcc | arm-linux-gnueabihf-g++ |           ✅          |
 | Windows     | amd64           | x86_64-w64-mingw32-gcc  | x86_64-w64-mingw32-g++  |           ✅          |
-| Windows     | arm64           | /llvm-mingw/llvm-mingw-20220906-ucrt-ubuntu-18.04-aarch64/bin/aarch64-w64-mingw32-gcc | /llvm-mingw/llvm-mingw-20220906-ucrt-ubuntu-18.04-aarch64/bin/aarch64-w64-mingw32-g++ |          ✅           |
+| Windows     | arm64           | /llvm-mingw/llvm-mingw/bin/aarch64-w64-mingw32-gcc | /llvm-mingw/llvm-mingw/bin/aarch64-w64-mingw32-g++ |          ✅           |
 
 ## Docker