Changeset 3493 in kBuild

Timestamp:

Dec 23, 2020 7:52:04 PM (4 years ago)

Author:

bird

Message:

Config.kmk: Allow targetting macOS 11.0 and the M1.

File:

• trunk/Config.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -289 +289 @@
    if $(KBUILD_TARGET_ARCH) == amd64
      KBUILD_MACOSX_TARGET_VERSION = 6
+   else if $(KBUILD_TARGET_ARCH) == arm64
+     KBUILD_MACOSX_TARGET_VERSION      := 0
+     KBUILD_MACOSX_TARGET_MAJOR_VERSION := 11
    else
      KBUILD_MACOSX_TARGET_VERSION = 5
    endif
   endif
+  ifndef KBUILD_MACOSX_TARGET_MAJOR_VERSION
+   KBUILD_MACOSX_TARGET_MAJOR_VERSION := 10
+  endif
   ifndef KBUILD_MACOSX_WHATEVER_MODE
-   if $(KBUILD_MACOSX_TARGET_VERSION) <= 4
+   if $(KBUILD_MACOSX_TARGET_VERSION) <= 4 && $(KBUILD_MACOSX_TARGET_MAJOR_VERSION) == 10
     TOOL_GCC4MACHO_SUFFIX               = -4.0
     TOOL_GXX4MACHO_SUFFIX               = -4.0
-   else if $(KBUILD_MACOSX_TARGET_VERSION) <= 9 # dunno which exactly.
+   else if $(KBUILD_MACOSX_TARGET_VERSION) <= 9 && $(KBUILD_MACOSX_TARGET_MAJOR_VERSION) == 10 # dunno which exactly.
     TOOL_GCC4MACHO_SUFFIX               = -4.2
     TOOL_GXX4MACHO_SUFFIX               = -4.2
    endif
    ifndef KBUILD_MACOSX_SDK
-    KBUILD_MACOSX_SDK            := /Developer/SDKs/MacOSX10.$(KBUILD_MACOSX_TARGET_VERSION)$(if-expr $(KBUILD_MACOSX_TARGET_VERSION)==4,u,).sdk
+    KBUILD_MACOSX_SDK            := /Developer/SDKs/MacOSX$(KBUILD_MACOSX_TARGET_MAJOR_VERSION).$(KBUILD_MACOSX_TARGET_VERSION)$(if-expr $(KBUILD_MACOSX_TARGET_MAJOR_VERSION).$(KBUILD_MACOSX_TARGET_VERSION)==10.4,u,).sdk
     ifeq ($(wildcard $(KBUILD_MACOSX_SDK)),)
      KBUILD_MACOSX_SDK           := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform$(KBUILD_MACOSX_SDK)
     endif
     ifeq ($(wildcard $(KBUILD_MACOSX_SDK)),)
-     KBUILD_MACOSX_SDK           := /Library/Developer/CommandLineTools/SDKs/MacOSX10.$(KBUILD_MACOSX_TARGET_VERSION)$(if-expr $(KBUILD_MACOSX_TARGET_VERSION)==4,u,).sdk
+     KBUILD_MACOSX_SDK           := /Library/Developer/CommandLineTools/SDKs/MacOSX$(KBUILD_MACOSX_TARGET_MAJOR_VERSION).$(KBUILD_MACOSX_TARGET_VERSION)$(if-expr $(KBUILD_MACOSX_TARGET_MAJOR_VERSION).$(KBUILD_MACOSX_TARGET_VERSION)==10.4,u,).sdk
     endif
    endif
@@ -315 +321 @@
   endif # !KBUILD_MACOSX_WHATEVER_MODE
   TEMPLATE_BIN_TOOL              = GCC4MACHO
-  TEMPLATE_BIN_CFLAGS            = -g -mmacosx-version-min=10.$(KBUILD_MACOSX_TARGET_VERSION) $(if $(KBUILD_MACOSX_WHATEVER_MODE),,-isysroot $(KBUILD_MACOSX_SDK))
+  TEMPLATE_BIN_CFLAGS            = -g -mmacosx-version-min=$(KBUILD_MACOSX_TARGET_MAJOR_VERSION).$(KBUILD_MACOSX_TARGET_VERSION) $(if $(KBUILD_MACOSX_WHATEVER_MODE),,-isysroot $(KBUILD_MACOSX_SDK))
   ifeq ($(USER),bird)
    TEMPLATE_BIN_CFLAGS          += -Wall $(GCC_Wextra) -pedantic -Wno-unused-parameter -Wno-long-long -Wshadow
@@ -322 +328 @@
   TEMPLATE_BIN_CFLAGS.profile    = -O3 -pg
   TEMPLATE_BIN_CFLAGS.release    = -O3
-  TEMPLATE_BIN_LDFLAGS           = -g -mmacosx-version-min=10.$(KBUILD_MACOSX_TARGET_VERSION) $(if $(KBUILD_MACOSX_WHATEVER_MODE),,-Wl,-syslibroot,$(KBUILD_MACOSX_SDK))
-  if $(KBUILD_MACOSX_TARGET_VERSION) == 4 && $(KBUILD_MACOSX_VERSION) >= 5
+  TEMPLATE_BIN_LDFLAGS           = -g -mmacosx-version-min=$(KBUILD_MACOSX_TARGET_MAJOR_VERSION).$(KBUILD_MACOSX_TARGET_VERSION) $(if $(KBUILD_MACOSX_WHATEVER_MODE),,-Wl,-syslibroot,$(KBUILD_MACOSX_SDK))
+  if $(KBUILD_MACOSX_TARGET_VERSION) == 4 && $(KBUILD_MACOSX_VERSION) >= 5 && $(KBUILD_MACOSX_TARGET_MAJOR_VERSION) == 10
    TEMPLATE_BIN_LDFLAGS         += -classic_ld
   endif