From 4c05525f0e44cf83d6e712086e9e60ffe45e6c27 Mon Sep 17 00:00:00 2001 From: Than McIntosh Date: Fri, 31 May 2019 12:05:07 -0400 Subject: [PATCH] cmd/link: revise test case to work on pre-10.14 macos Rework this recently introduced test case to insure that it works with older versions of the OS. It was using a new framework library not available on pre-10.14 to trigger the weak symbol reference; switch to using a new symbol from an existing library. Tested on MacOS 10.14 and 10.11. Updates #32233. Change-Id: I1fe2a9255fca46cb7cdf33ff7fed67bba86fdc22 Reviewed-on: https://go-review.googlesource.com/c/go/+/179837 Run-TryBot: Than McIntosh TryBot-Result: Gobot Gobot Reviewed-by: David Chase --- src/cmd/link/internal/ld/testdata/issue32233/lib/ObjC.m | 8 +++++--- src/cmd/link/internal/ld/testdata/issue32233/lib/lib.go | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/cmd/link/internal/ld/testdata/issue32233/lib/ObjC.m b/src/cmd/link/internal/ld/testdata/issue32233/lib/ObjC.m index 78e6e9e252..946278803e 100644 --- a/src/cmd/link/internal/ld/testdata/issue32233/lib/ObjC.m +++ b/src/cmd/link/internal/ld/testdata/issue32233/lib/ObjC.m @@ -3,12 +3,14 @@ // license that can be found in the LICENSE file. #import -#import +#import BOOL function(void) { +#if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && (MAC_OS_X_VERSION_MIN_REQUIRED > 101300) + NSAppearance *darkAppearance; if (@available(macOS 10.14, *)) { - UNUserNotificationCenter *center = - [UNUserNotificationCenter currentNotificationCenter]; + darkAppearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]; } +#endif return NO; } diff --git a/src/cmd/link/internal/ld/testdata/issue32233/lib/lib.go b/src/cmd/link/internal/ld/testdata/issue32233/lib/lib.go index efd56fb340..514b9b9a4a 100644 --- a/src/cmd/link/internal/ld/testdata/issue32233/lib/lib.go +++ b/src/cmd/link/internal/ld/testdata/issue32233/lib/lib.go @@ -5,8 +5,8 @@ package lib /* -#cgo darwin CFLAGS: -mmacosx-version-min=10.10 -D__MAC_OS_X_VERSION_MAX_ALLOWED=101450 -Wunguarded-availability-new -#cgo darwin LDFLAGS: -framework Foundation -framework UserNotifications +#cgo darwin CFLAGS: -D__MAC_OS_X_VERSION_MAX_ALLOWED=101450 +#cgo darwin LDFLAGS: -framework Foundation -framework AppKit #include "stdlib.h" int function(void); */ -- 2.50.0