Skip to content

Commit c8b72e2

Browse files
[CompilerSupportLibraries_jll] Upgrade to libraries from GCC 12 (JuliaLang#47544)
1 parent 1387750 commit c8b72e2

File tree

6 files changed

+110
-96
lines changed

6 files changed

+110
-96
lines changed

Make.inc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,13 +1469,19 @@ else
14691469
LIBGCC_NAME := libgcc_s_seh-1.$(SHLIB_EXT)
14701470
endif
14711471
endif
1472+
# On macOS, libgcc_s has soversion 1.1 always on aarch64 and only for GCC 12+
1473+
# (-> libgfortran 5) on x86_64
14721474
ifeq ($(OS),Darwin)
14731475
ifeq ($(ARCH),aarch64)
14741476
LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
14751477
else
1478+
ifeq ($(LIBGFORTRAN_VERSION),5)
1479+
LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
1480+
else
14761481
LIBGCC_NAME := libgcc_s.1.$(SHLIB_EXT)
14771482
endif
14781483
endif
1484+
endif
14791485
ifneq ($(findstring $(OS),Linux FreeBSD),)
14801486
LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1
14811487
endif

base/Makefile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,19 @@ else ifneq ($(USE_SYSTEM_OPENLIBM),0)
206206
$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME)))
207207
endif
208208

209-
ifeq ($(APPLE_ARCH),arm64)
209+
# On macOS, libgcc_s has soversion 1.1 always on aarch64 and only for GCC 12+
210+
# (-> libgfortran 5) on x86_64
211+
ifeq ($(OS),Darwin)
212+
ifeq ($(ARCH),aarch64)
213+
$(eval $(call symlink_system_library,CSL,libgcc_s,1.1))
214+
else
215+
ifeq ($(LIBGFORTRAN_VERSION),5)
210216
$(eval $(call symlink_system_library,CSL,libgcc_s,1.1))
211217
else
212218
$(eval $(call symlink_system_library,CSL,libgcc_s,1))
213219
endif
220+
endif
221+
endif
214222
ifneq (,$(LIBGFORTRAN_VERSION))
215223
$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
216224
endif

0 commit comments

Comments
 (0)