Skip to content

Commit

Permalink
Do not hide libssp.dll.a (Windows import library) in private library …
Browse files Browse the repository at this point in the history
…dir (#52820)

Fix #51740 

Since we are providing libssp.dll on Windows and we want to dynamically
link to it, exposing libssp.dll.a is necessary. The inconsistency is
that libjulia-codegen.so looks in build_libdir and build_private_libdir
while standard library precompilation looks in build_shlibdir and
build_private_dir.
  • Loading branch information
mkitti committed Jan 14, 2024
1 parent 4d670fb commit c3836e1
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions deps/csl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ install-csl:
cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/13/libgcc.a $(build_private_libdir)/
cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/13/libmsvcrt.a $(build_private_libdir)/
cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/13/libssp.dll.a $(build_private_libdir)/
cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/13/libssp.dll.a $(build_libdir)/
endif
endif
ifeq ($(OS),WINNT)
Expand All @@ -120,4 +121,5 @@ uninstall-gcc-libraries:
-rm -f $(build_private_libdir)/libgcc.a
-rm -f $(build_private_libdir)/libmsvcrt.a
-rm -f $(build_private_libdir)/libssp.dll.a
-rm -f $(build_libdir)/libssp.dll.a
endif

3 comments on commit c3836e1

@vtjnash
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nanosoldier runbenchmarks(ALL, isdaily = true)

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your benchmark job has completed - possible performance regressions were detected. A full report can be found here.

@vtjnash
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I probably should have tried to separate 8e4221f (LLVM 16) into a separate day, since that was a very noisy diff. But hopefully this is overall a good change

Please sign in to comment.