Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CompilerSupportLibraries_jll] Upgrade to libraries from GCC 12 #45582

Merged
merged 12 commits into from
Nov 3, 2022
Merged

[CompilerSupportLibraries_jll] Upgrade to libraries from GCC 12 #45582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
566727b
[CompilerSupportLibraries_jll] Upgrade to libraries from GCC 12
giordano Jun 4, 2022
ca8af8f
[CompilerSupportLibraries_jll] Fix soname of libgcc_s on x86_64-darwin
giordano Jun 4, 2022
f0a4cdf
[CompilerSupportLibraries_jll] Update to v0.6.1 to get latest libgcc_…
giordano Jun 6, 2022
b15c3cf
Add libstdc++ to list of preloaded libraries
giordano Aug 29, 2022
d5df519
Try to build on Windows with Buildkite
giordano Sep 26, 2022
2357358
Debug printing
giordano Sep 27, 2022
522d931
Revert "Try to build on Windows with Buildkite"
giordano Sep 27, 2022
0fa109d
More debugging
giordano Sep 27, 2022
3a1d5f7
Revert "More debugging"
giordano Oct 27, 2022
a6d9ffa
Revert "Debug printing"
giordano Oct 27, 2022
1ac4f98
Revert "Add libstdc++ to list of preloaded libraries"
giordano Oct 29, 2022
644a547
[CompilerSupportLibraries_jll] Use new build with fix for Windows lib…
giordano Oct 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Make.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,13 +1478,19 @@ else
LIBGCC_NAME := libgcc_s_seh-1.$(SHLIB_EXT)
endif
endif
# On macOS, libgcc_s has soversion 1.1 always on aarch64 and only for GCC 12+
# (-> libgfortran 5) on x86_64
ifeq ($(OS),Darwin)
ifeq ($(ARCH),aarch64)
LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
else
ifeq ($(LIBGFORTRAN_VERSION),5)
LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
else
LIBGCC_NAME := libgcc_s.1.$(SHLIB_EXT)
endif
endif
endif
ifneq ($(findstring $(OS),Linux FreeBSD),)
LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1
endif
Expand Down
10 changes: 9 additions & 1 deletion base/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,19 @@ else ifneq ($(USE_SYSTEM_OPENLIBM),0)
$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME)))
endif

ifeq ($(APPLE_ARCH),arm64)
# On macOS, libgcc_s has soversion 1.1 always on aarch64 and only for GCC 12+
# (-> libgfortran 5) on x86_64
ifeq ($(OS),Darwin)
ifeq ($(ARCH),aarch64)
$(eval $(call symlink_system_library,CSL,libgcc_s,1.1))
else
ifeq ($(LIBGFORTRAN_VERSION),5)
$(eval $(call symlink_system_library,CSL,libgcc_s,1.1))
else
$(eval $(call symlink_system_library,CSL,libgcc_s,1))
endif
endif
endif
ifneq (,$(LIBGFORTRAN_VERSION))
$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
endif
Expand Down
Loading