epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Drop macOS i386 ARCH_CLASS, add arm64

Browse Source
This commit is contained in:
Andrew Johnson
2021-04-06 11:19:51 -05:00
parent f3da6e9464
commit ead24c4fd6
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure/CONFIG_SITE
View File

@ -17,7 +17,8 @@
# Currently Supporting: # Currently Supporting:
# cygwin-x86 (cygwin compiler used for host builds) # cygwin-x86 (cygwin compiler used for host builds)
# cygwin-x86_64 (cygwin compiler used for host builds) # cygwin-x86_64 (cygwin compiler used for host builds)
# darwin-x86 (Intel based Apple running OSX) # darwin-aarch64 (M1 based Apple using CLANG compiler)
# darwin-x86 (Intel based Apple using CLANG compiler)
# freebsd-x86 (GNU compiler used for host builds) # freebsd-x86 (GNU compiler used for host builds)
# freebsd-x86_64 (GNU compiler used for host builds) # freebsd-x86_64 (GNU compiler used for host builds)
# linux-aarch64 (GNU compiler used for host builds) # linux-aarch64 (GNU compiler used for host builds)

8
configure/os/CONFIG_SITE.Common.darwin-x86
View File

@ -4,14 +4,12 @@
#------------------------------------------------------- #-------------------------------------------------------
# Select which CPU architecture(s) to include in your MacOS binaries: # Select which CPU architecture(s) to include in your MacOS binaries:
# i386, x86_64, or both (fat binaries). # x86_64 only, or arm64 as well (fat binaries).
#ARCH_CLASS = i386
ARCH_CLASS = x86_64 ARCH_CLASS = x86_64
#ARCH_CLASS = i386 x86_64 #ARCH_CLASS = arm64 x86_64
# # Uncomment the following 3 lines to build with GCC instead of CLANG.
# Uncomment the following 3 lines to build with Apple's GCC instead of CLANG.
# #
#CMPLR_CLASS = gcc #CMPLR_CLASS = gcc
#CC = gcc #CC = gcc

5
src/tools/EpicsHostArch.pl
View File

@ -47,9 +47,8 @@ sub HostArch {
my ($kernel, $hostname, $release, $version, $cpu) = uname; my ($kernel, $hostname, $release, $version, $cpu) = uname;
if (m/^darwin/) { if (m/^darwin/) {
for ($cpu) { for ($cpu) {
return 'darwin-x86' if m/^(i386|x86_64)/; return 'darwin-x86' if m/^x86_64/;
return 'darwin-ppc' if m/Power Macintosh/; return 'darwin-aarch64' if m/^arm64/;
return 'darwin-aarch64' if m/arm64/;
} }
die "$0: macOS CPU type '$cpu' not recognized\n"; die "$0: macOS CPU type '$cpu' not recognized\n";
} }