[Vm-dev] [commit][3610] Make the Mac makefiles look for and use the most up-to-date SDK available (until

commits at squeakvm.org commits at squeakvm.org
Tue Feb 16 02:09:44 UTC 2016


Revision: 3610
Author:   eliot
Date:     2016-02-15 18:09:44 -0800 (Mon, 15 Feb 2016)
Log Message:
-----------
Make the Mac makefiles look for and use the most up-to-date SDK available (until
a 10.13 is introduced).

Eliinate unnecessary quotes in ifeq constructs in the gnu Makefiles.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/common/Makefile.app
    branches/Cog/build.macos32x86/common/Makefile.flags
    branches/Cog/build.macos32x86/common/Makefile.plugin
    branches/Cog/build.macos32x86/common/Makefile.vm
    branches/Cog/build.macos64x64/common/Makefile.app
    branches/Cog/build.macos64x64/common/Makefile.flags
    branches/Cog/build.macos64x64/common/Makefile.plugin
    branches/Cog/build.macos64x64/common/Makefile.vm
    branches/Cog/build.win32x86/common/Makefile
    branches/Cog/build.win32x86/common/Makefile.plugin

Modified: branches/Cog/build.macos32x86/common/Makefile.app
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.app	2016-02-16 01:43:13 UTC (rev 3609)
+++ branches/Cog/build.macos32x86/common/Makefile.app	2016-02-16 02:09:44 UTC (rev 3610)
@@ -24,9 +24,9 @@
 # debug. Optional. Defaults to product. The default is overridden in mvm script
 
 
-ifeq ("$(CONFIGURATION)","debug")
+ifeq ($(CONFIGURATION),debug)
 	APP:=CocoaDebug.app
-else ifeq ("$(CONFIGURATION)","assert")
+else ifeq ($(CONFIGURATION),assert)
 	APP:=CocoaAssert.app
 else # default CONFIGURATION=product => CocoaFast.app
 	APP:=CocoaFast.app

Modified: branches/Cog/build.macos32x86/common/Makefile.flags
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.flags	2016-02-16 01:43:13 UTC (rev 3609)
+++ branches/Cog/build.macos32x86/common/Makefile.flags	2016-02-16 02:09:44 UTC (rev 3610)
@@ -5,7 +5,9 @@
 
 XCODE:=/Applications/Xcode.app/Contents/Developer
 XCUB:=$(XCODE)/usr/bin
-SDK:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk
+SDKsDIR:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs
+SDKs:=MacOSX10.12.sdk MacOSX10.11.sdk MacOSX10.10.sdk MacOSX10.9.sdk
+SDK:=$(firstword $(realpath $(addprefix $(SDKsDIR)/, $(SDKs))))
 TARGET_ARCH:=i386
 TARGET_VERSION_MIN:=10.6
 

Modified: branches/Cog/build.macos32x86/common/Makefile.plugin
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.plugin	2016-02-16 01:43:13 UTC (rev 3609)
+++ branches/Cog/build.macos32x86/common/Makefile.plugin	2016-02-16 02:09:44 UTC (rev 3610)
@@ -15,11 +15,11 @@
 # SRCDIRS    supplies additional directories containing files to compile.
 
 # VM config flags.
-ifeq ("$(CONFIGURATION)","product")
+ifeq ($(CONFIGURATION),product)
 OFLAGS:= -g -Os
 DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1
 BUILD:=build
-else ifeq ("$(CONFIGURATION)","assert")
+else ifeq ($(CONFIGURATION),assert)
 OFLAGS:= -g -O1 -fno-omit-frame-pointer
 DEBUGVM=-DDEBUGVM=0
 BUILD:=buildast

Modified: branches/Cog/build.macos32x86/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.vm	2016-02-16 01:43:13 UTC (rev 3609)
+++ branches/Cog/build.macos32x86/common/Makefile.vm	2016-02-16 02:09:44 UTC (rev 3610)
@@ -31,9 +31,9 @@
 # Build directories
 #
 
-ifeq ("$(CONFIGURATION)","assert")
+ifeq ($(CONFIGURATION),assert)
 	BUILD:=buildast
-else ifeq ("$(CONFIGURATION)","debug")
+else ifeq ($(CONFIGURATION),debug)
 	BUILD:=builddbg
 else # default CONFIGURATION=product
 	BUILD:=build
@@ -88,11 +88,11 @@
 
 
 # VM config flags.
-ifeq ("$(CONFIGURATION)","debug")
+ifeq ($(CONFIGURATION),debug)
 OFLAGS:= -g -O0 -fno-omit-frame-pointer
 DEBUGVM=-DDEBUGVM=1
 INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'
-else ifeq ("$(CONFIGURATION)","assert")
+else ifeq ($(CONFIGURATION),assert)
 OFLAGS:= -g -O1 -fno-omit-frame-pointer
 DEBUGVM=-DDEBUGVM=0
 INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'

Modified: branches/Cog/build.macos64x64/common/Makefile.app
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.app	2016-02-16 01:43:13 UTC (rev 3609)
+++ branches/Cog/build.macos64x64/common/Makefile.app	2016-02-16 02:09:44 UTC (rev 3610)
@@ -24,9 +24,9 @@
 # debug. Optional. Defaults to product. The default is overridden in mvm script
 
 
-ifeq ("$(CONFIGURATION)","debug")
+ifeq ($(CONFIGURATION),debug)
 	APP:=CocoaDebug.app
-else ifeq ("$(CONFIGURATION)","assert")
+else ifeq ($(CONFIGURATION),assert)
 	APP:=CocoaAssert.app
 else # default CONFIGURATION=product => CocoaFast.app
 	APP:=CocoaFast.app

Modified: branches/Cog/build.macos64x64/common/Makefile.flags
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.flags	2016-02-16 01:43:13 UTC (rev 3609)
+++ branches/Cog/build.macos64x64/common/Makefile.flags	2016-02-16 02:09:44 UTC (rev 3610)
@@ -5,7 +5,9 @@
 
 XCODE:=/Applications/Xcode.app/Contents/Developer
 XCUB:=$(XCODE)/usr/bin
-SDK:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk
+SDKsDIR:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs
+SDKs:=MacOSX10.12.sdk MacOSX10.11.sdk MacOSX10.10.sdk MacOSX10.9.sdk
+SDK:=$(firstword $(realpath $(addprefix $(SDKsDIR)/, $(SDKs))))
 TARGET_ARCH:=x86_64
 TARGET_VERSION_MIN:=10.6
 

Modified: branches/Cog/build.macos64x64/common/Makefile.plugin
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.plugin	2016-02-16 01:43:13 UTC (rev 3609)
+++ branches/Cog/build.macos64x64/common/Makefile.plugin	2016-02-16 02:09:44 UTC (rev 3610)
@@ -15,11 +15,11 @@
 # SRCDIRS    supplies additional directories containing files to compile.
 
 # VM config flags.
-ifeq ("$(CONFIGURATION)","product")
+ifeq ($(CONFIGURATION),product)
 OFLAGS:= -g -Os
 DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1
 BUILD:=build
-else ifeq ("$(CONFIGURATION)","assert")
+else ifeq ($(CONFIGURATION),assert)
 OFLAGS:= -g -O1 -fno-omit-frame-pointer
 DEBUGVM=-DDEBUGVM=0
 BUILD:=buildast

Modified: branches/Cog/build.macos64x64/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.vm	2016-02-16 01:43:13 UTC (rev 3609)
+++ branches/Cog/build.macos64x64/common/Makefile.vm	2016-02-16 02:09:44 UTC (rev 3610)
@@ -31,9 +31,9 @@
 # Build directories
 #
 
-ifeq ("$(CONFIGURATION)","assert")
+ifeq ($(CONFIGURATION),assert)
 	BUILD:=buildast
-else ifeq ("$(CONFIGURATION)","debug")
+else ifeq ($(CONFIGURATION),debug)
 	BUILD:=builddbg
 else # default CONFIGURATION=product
 	BUILD:=build
@@ -88,11 +88,11 @@
 
 
 # VM config flags.
-ifeq ("$(CONFIGURATION)","debug")
+ifeq ($(CONFIGURATION),debug)
 OFLAGS:= -g -O0 -fno-omit-frame-pointer
 DEBUGVM=-DDEBUGVM=1
 INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'
-else ifeq ("$(CONFIGURATION)","assert")
+else ifeq ($(CONFIGURATION),assert)
 OFLAGS:= -g -O1 -fno-omit-frame-pointer
 DEBUGVM=-DDEBUGVM=0
 INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'

Modified: branches/Cog/build.win32x86/common/Makefile
===================================================================
--- branches/Cog/build.win32x86/common/Makefile	2016-02-16 01:43:13 UTC (rev 3609)
+++ branches/Cog/build.win32x86/common/Makefile	2016-02-16 02:09:44 UTC (rev 3610)
@@ -53,7 +53,7 @@
 
 CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) $(wildcard $(CROSSDIR)/*.cpp)
 WIN32SRC:= $(wildcard $(WIN32DIR)/*.c) $(wildcard $(WIN32DIR)/*.cpp)
-ifeq ("$(THREADING)","multi")
+ifeq ($(THREADING),multi)
 MAKERSRC:= $(wildcard $(VMSRCDIR)/gcc3x-*interpmt.c $(VMSRCDIR)/cogit.c)
 else
 MAKERSRC:= $(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c)
@@ -80,7 +80,7 @@
 #############################################################################
 # SqueakVM definitions
 #
-ifeq ("$(CONFIGURATION)","product")
+ifeq ($(CONFIGURATION),product)
 VMEXE:=  $(OBJDIR)/$(VM)Unstripped.exe
 CONSOLEVMEXE:=  $(OBJDIR)/$(VM)ConsoleUnstripped.exe
 STRIPEXE:=  $(OBJDIR)/$(VM).exe
@@ -115,11 +115,11 @@
 CC:=gcc
 
 # VM config flags.
-ifeq ("$(CONFIGURATION)","product")
+ifeq ($(CONFIGURATION),product)
 OFLAGS:= -D_MT -O2 -march=pentium4 -momit-leaf-frame-pointer -funroll-loops
 NDEBUG:=-DNDEBUG -D'VM_LABEL(foo)=0' # Define NDEBUG for production to exclude asserts
 DEBUGVM=0
-else ifeq ("$(CONFIGURATION)","assert")
+else ifeq ($(CONFIGURATION),assert)
 OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer
 DEBUGVM=0
 NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'
@@ -129,7 +129,7 @@
 NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'
 endif
 
-ifeq ("$(THREADING)","multi")
+ifeq ($(THREADING),multi)
 COGDEFS:=-DCOGMTVM=1 -DDEBUGVM=$(DEBUGVM)
 else
 COGDEFS:=-DCOGMTVM=0 -DDEBUGVM=$(DEBUGVM)

Modified: branches/Cog/build.win32x86/common/Makefile.plugin
===================================================================
--- branches/Cog/build.win32x86/common/Makefile.plugin	2016-02-16 01:43:13 UTC (rev 3609)
+++ branches/Cog/build.win32x86/common/Makefile.plugin	2016-02-16 02:09:44 UTC (rev 3610)
@@ -55,12 +55,12 @@
 		-DNO_SERVICE -DNO_STD_FILE_SUPPORT \
 		$(NDEBUG) -DLSB_FIRST -DVM_NAME=\"$(VM)\" -DX86 $(XDEFS)
 # define _MT to eliminate the inline versions of printf et al in mingw/stdio.h
-ifeq ("$(CONFIGURATION)","product")
+ifeq ($(CONFIGURATION),product)
 OFLAGS:= -D_MT -O1 -march=pentium4 -momit-leaf-frame-pointer -funroll-loops \
 		-fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf
 NDEBUG:=-DNDEBUG
 DEBUGVM=0
-else ifeq ("$(CONFIGURATION)","assert")
+else ifeq ($(CONFIGURATION),assert)
 OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer \
 		-fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf
 DEBUGVM=0



More information about the Vm-dev mailing list