Skip to content

Commit

Permalink
[CompilerSupportLibraries_jll] Upgrade to libraries from GCC 12 (#45582)
Browse files Browse the repository at this point in the history
* [CompilerSupportLibraries_jll] Upgrade to libraries from GCC 12

* [CompilerSupportLibraries_jll] Fix soname of libgcc_s on x86_64-darwin

* [CompilerSupportLibraries_jll] Update to v0.6.1 to get latest libgcc_s on x86_64-darwin

* Add libstdc++ to list of preloaded libraries

* Try to build on Windows with Buildkite

* Debug printing

* Revert "Try to build on Windows with Buildkite"

This reverts commit f973004.

* More debugging

* Revert "More debugging"

This reverts commit 8d05d32.

* Revert "Debug printing"

This reverts commit 4c14b58.

* Revert "Add libstdc++ to list of preloaded libraries"

This reverts commit c2c182d.

* [CompilerSupportLibraries_jll] Use new build with fix for Windows libstdc++
  • Loading branch information
giordano authored Nov 3, 2022
1 parent 0ff2373 commit 10fcec9
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 96 deletions.
6 changes: 6 additions & 0 deletions Make.inc
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
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

0 comments on commit 10fcec9

Please sign in to comment.