Skip to content

Commit 6ded6aa

Browse files
Zentrikvtjnash
andauthored
Link against libstdc++ from CSL on windows (#58151)
Fix #57021. Split out from #58142, not sure if there is a better way to fix this. --------- Co-authored-by: Jameson Nash <[email protected]>
1 parent 3f96528 commit 6ded6aa

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

deps/csl.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ ifeq ($(OS),WINNT)
120120
GCC_VERSION = 14
121121
install-csl:
122122
mkdir -p $(build_private_libdir)/
123+
cp -a $(build_shlibdir)/$(call versioned_libname,libstdc++,6) $(build_shlibdir)/libstdc++.$(SHLIB_EXT)
123124
cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libgcc_s.a $(build_private_libdir)/
124125
cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libgcc.a $(build_private_libdir)/
125126
cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libmsvcrt.a $(build_private_libdir)/
@@ -130,6 +131,7 @@ endif
130131
ifeq ($(OS),WINNT)
131132
uninstall-csl: uninstall-gcc-libraries
132133
uninstall-gcc-libraries:
134+
-rm -f $(build_shlibdir)/libstdc++.$(SHLIB_EXT)
133135
-rm -f $(build_private_libdir)/libgcc_s.a
134136
-rm -f $(build_private_libdir)/libgcc.a
135137
-rm -f $(build_private_libdir)/libmsvcrt.a

0 commit comments

Comments
 (0)