diff --git a/Make.inc b/Make.inc index 1b223b245a56b..6e4b8b73299ae 100644 --- a/Make.inc +++ b/Make.inc @@ -1473,11 +1473,7 @@ LIBGCC_NAME := libgcc_s_seh-1.$(SHLIB_EXT) endif endif ifeq ($(OS),Darwin) -ifeq ($(ARCH),aarch64) LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT) -else -LIBGCC_NAME := libgcc_s.1.$(SHLIB_EXT) -endif endif ifneq ($(findstring $(OS),Linux FreeBSD),) LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1 diff --git a/base/Makefile b/base/Makefile index 1c1901e9499fb..97d8bd272a81c 100644 --- a/base/Makefile +++ b/base/Makefile @@ -235,10 +235,8 @@ else ifneq ($(USE_SYSTEM_OPENLIBM),0) $(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME))) endif -ifeq ($(APPLE_ARCH),arm64) +ifeq ($(OS), Darwin) $(eval $(call symlink_system_library,CSL,libgcc_s,1.1)) -else -$(eval $(call symlink_system_library,CSL,libgcc_s,1)) endif ifneq (,$(LIBGFORTRAN_VERSION)) $(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION))) diff --git a/deps/csl.mk b/deps/csl.mk index e3f84aa98974d..5b9c5e6f5cf18 100644 --- a/deps/csl.mk +++ b/deps/csl.mk @@ -76,7 +76,7 @@ else $(eval $(call copy_csl,$(call versioned_libname,libgcc_s_seh,1))) endif else -ifeq ($(APPLE_ARCH),arm64) +ifeq ($(OS), Darwin) $(eval $(call copy_csl,$(call versioned_libname,libgcc_s,1.1))) else $(eval $(call copy_csl,$(call versioned_libname,libgcc_s,1)))