From 72b7f148cff202d4648b929e18fcc6e321669dac Mon Sep 17 00:00:00 2001 From: Ajinkya Kokandakar Date: Tue, 18 Feb 2025 00:22:21 -0600 Subject: [PATCH 1/2] adds libmsvcrt from mingw-64 to the build directory, based on this: https://github.com/Zentrik/llvm_julia_tester/blob/d8bfc7590bbcb3a9bc5c9eedbfe11bf65eddd91c/julia-patches/ffba662dd275d1bdd5a5935f4d3cc372b5235d07 --- deps/csl.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deps/csl.mk b/deps/csl.mk index fef950aa41621..ce9906683add4 100644 --- a/deps/csl.mk +++ b/deps/csl.mk @@ -125,6 +125,11 @@ install-csl: cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libmsvcrt.a $(build_private_libdir)/ cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libssp.dll.a $(build_private_libdir)/ cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libssp.dll.a $(build_libdir)/ +ifeq ($(ARCH),x86_64) + -cp -a /mingw64/lib/libmsvcrt.a $(build_private_libdir)/ +else + -cp -a /mingw32/i686-w64-mingw32/lib/libmsvcrt.a $(build_private_libdir)/ +endif # ifeq ($(ARCH),x86_64) endif endif ifeq ($(OS),WINNT) From b6ab310c85406f4b1f157021de98b0e583d958fc Mon Sep 17 00:00:00 2001 From: Ajinkya Kokandakar Date: Tue, 18 Feb 2025 10:27:35 -0600 Subject: [PATCH 2/2] using mingw env variable for the lib path in csl.mk instead of hardcoded mingw lib path --- deps/csl.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/deps/csl.mk b/deps/csl.mk index ce9906683add4..0355ed80bf7d3 100644 --- a/deps/csl.mk +++ b/deps/csl.mk @@ -125,11 +125,7 @@ install-csl: cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libmsvcrt.a $(build_private_libdir)/ cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libssp.dll.a $(build_private_libdir)/ cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libssp.dll.a $(build_libdir)/ -ifeq ($(ARCH),x86_64) - -cp -a /mingw64/lib/libmsvcrt.a $(build_private_libdir)/ -else - -cp -a /mingw32/i686-w64-mingw32/lib/libmsvcrt.a $(build_private_libdir)/ -endif # ifeq ($(ARCH),x86_64) + -cp -a $(MINGW_PREFIX)/lib/libmsvcrt.a $(build_private_libdir)/ endif endif ifeq ($(OS),WINNT)