diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp index 5ad2977b62..ff0b596221 100644 --- a/client/hostinfo_unix.cpp +++ b/client/hostinfo_unix.cpp @@ -809,14 +809,14 @@ static void get_cpu_info_mac(HOST_INFO& host) { char features[P_FEATURES_SIZE]; char *p; char *sep=" "; - int family, stepping, model, feature; - string feature_string; len = sizeof(brand_string); sysctlbyname("machdep.cpu.brand_string", brand_string, &len, NULL, 0); #if defined(__i386__) || defined(__x86_64__) + int family, stepping, model; + // on an Apple M1 chip the cpu.vendor is broken, family, model and stepping don't exist if (!strncmp(brand_string, "Apple M", strlen("Apple M"))) { @@ -849,6 +849,9 @@ static void get_cpu_info_mac(HOST_INFO& host) { #else // defined(__i386__) || defined(__x86_64__) + int feature; + string feature_string; + strcpy(host.p_vendor, "Apple"); strncpy(host.p_model, brand_string, sizeof(host.p_model)); diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 8a438bf8ae..913735d669 100644 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -584,6 +584,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + B15487172667809100A9FDBA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 20286C28FDCF999611CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = DD407A4907D2FB1200163EF5; + remoteInfo = libboinc; + }; B1A32E54265D206800896566 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 20286C28FDCF999611CA2CEA /* Project object */; @@ -591,13 +598,6 @@ remoteGlobalIDString = B13E2D0E265564D100D5C977; remoteInfo = detect_rosetta_cpu; }; - B1A32E57265D20FB00896566 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 20286C28FDCF999611CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = DD407A4907D2FB1200163EF5; - remoteInfo = libboinc; - }; DD095D1E0F3B22DE000902F5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 20286C28FDCF999611CA2CEA /* Project object */; @@ -2250,6 +2250,7 @@ buildRules = ( ); dependencies = ( + B15487182667809100A9FDBA /* PBXTargetDependency */, ); name = detect_rosetta_cpu; productName = detect_rosetta_cpu; @@ -2578,7 +2579,6 @@ buildRules = ( ); dependencies = ( - B1A32E58265D20FB00896566 /* PBXTargetDependency */, B1A32E55265D206800896566 /* PBXTargetDependency */, DD25E20D220438090040366F /* PBXTargetDependency */, ); @@ -3681,16 +3681,16 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + B15487182667809100A9FDBA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DD407A4907D2FB1200163EF5 /* libboinc */; + targetProxy = B15487172667809100A9FDBA /* PBXContainerItemProxy */; + }; B1A32E55265D206800896566 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B13E2D0E265564D100D5C977 /* detect_rosetta_cpu */; targetProxy = B1A32E54265D206800896566 /* PBXContainerItemProxy */; }; - B1A32E58265D20FB00896566 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = DD407A4907D2FB1200163EF5 /* libboinc */; - targetProxy = B1A32E57265D20FB00896566 /* PBXContainerItemProxy */; - }; DD095D1F0F3B22DE000902F5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = DD89161C0F3B17E900DE5B1C /* ss_app */;