cleaned up OS X build configurations

This commit is contained in:
Guenter Obiltschnig 2015-12-11 10:03:45 +01:00
parent 1483d0d112
commit c8a39fcac1
12 changed files with 50 additions and 233 deletions

View File

@ -1,12 +1,10 @@
#
# $Id: //poco/1.4/build/config/Darwin#6 $
# $Id
#
# Darwin
#
# Build settings for Mac OS X 10.6 or newer, using Clang.
#
# NOTE: This build configuration will build 64-bit binaries.
# Use the Darwin32 build configuration to build 32-bit binaries.
# Build settings for Mac OS X 10.8 or later, clang, 64-bits, with C++11 support.
# Build settings are compatible with XCode 7 C++ projects.
#
include $(POCO_BASE)/build/config/Darwin-clang

View File

@ -1,14 +1,10 @@
#
# $Id: //poco/1.4/build/config/Darwin-clang#4 $
# $Id$
#
# Darwin
# Darwin-clang
#
# Build settings for Mac OS X 10.6 (clang++)
# The build settings defined in this file are compatible
# with XCode 4 C++ projects.
#
# NOTE: This build configuration will build 64-bit binaries.
# Use the Darwin32-clang build configuration to build 32-bit binaries.
# Build settings for Mac OS X 10.8 or later, clang, 64-bits, with C++11 support.
# Build settings are compatible with XCode 7 C++ projects.
#
#
@ -29,8 +25,8 @@ endif
#
# Tools
#
CC = clang
CXX = clang++
CC = $(shell xcrun -find clang)
CXX = $(shell xcrun -find clang++)
LINK = $(CXX) -bind_at_load
LIB = libtool -static -o
RANLIB = ranlib
@ -54,10 +50,10 @@ SHAREDLIBLINKEXT = .dylib
# Compiler and Linker Flags
#
CFLAGS = $(ARCHFLAGS)
CXXFLAGS = $(ARCHFLAGS) -Wall -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-unneeded-internal-declaration
LINKFLAGS = $(ARCHFLAGS)
SHLIBFLAGS = $(ARCHFLAGS)
DYLIBFLAGS = $(ARCHFLAGS)
CXXFLAGS = $(ARCHFLAGS) -std=c++11 -stdlib=libc++ -Wall -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-unneeded-internal-declaration
LINKFLAGS = $(ARCHFLAGS) -stdlib=libc++
SHLIBFLAGS = $(ARCHFLAGS) -stdlib=libc++
DYLIBFLAGS = $(ARCHFLAGS) -stdlib=libc++
STATICOPT_CC =
STATICOPT_CXX =
STATICOPT_LINK =

View File

@ -1,82 +1,12 @@
#
# $Id: //poco/1.4/build/config/Darwin-clang#4 $
# $Id$
#
# Darwin
# Darwin-clang-libc++
#
# Build settings for Mac OS X 10.6 (clang++)
# The build settings defined in this file are compatible
# with XCode 4 C++ projects.
#
# NOTE: This build configuration will build 64-bit binaries.
# Use the Darwin32-clang build configuration to build 32-bit binaries.
# Build settings for Mac OS X 10.8 or later, clang, 64-bits, with C++11 support.
# Build settings are compatible with XCode 7 C++ projects.
#
# Note: provided for backwards compatibility.
#
#
# General Settings
#
LINKMODE ?= SHARED
POCO_TARGET_OSARCH ?= x86_64
POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH)
ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH)
OPENSSL_DIR ?= /usr/local/opt/openssl/
ifeq ($(POCO_TARGET_OSARCH),i386)
RORELOCS = -read_only_relocs suppress
endif
#
# Tools
#
CC = $(shell xcrun -find clang)
CXX = $(shell xcrun -find clang++)
LINK = $(CXX) -bind_at_load
LIB = libtool -static -o
RANLIB = ranlib
SHLIB = $(CXX) -dynamiclib -Wl,-install_name,$(POCO_LIB_INSTALLDIR)/$(notdir \$@) -o $@
DYLIB = $(CXX) -dynamic -bundle $(RORELOCS) -Wl,-bind_at_load -o $@
SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP =
DEP = $(POCO_BASE)/build/script/makedepend.clang
SHELL = sh
RM = rm -rf
CP = cp
MKDIR = mkdir -p
#
# Extension for Shared Libraries
#
SHAREDLIBEXT = .$(target_version).dylib
SHAREDLIBLINKEXT = .dylib
#
# Compiler and Linker Flags
#
CFLAGS = $(ARCHFLAGS)
CXXFLAGS = $(ARCHFLAGS) -std=c++11 -stdlib=libc++ -Wall -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-unneeded-internal-declaration
LINKFLAGS = $(ARCHFLAGS) -stdlib=libc++
SHLIBFLAGS = $(ARCHFLAGS) -stdlib=libc++
DYLIBFLAGS = $(ARCHFLAGS) -stdlib=libc++
STATICOPT_CC =
STATICOPT_CXX =
STATICOPT_LINK =
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK =
DEBUGOPT_CC = -O0 -g -gdwarf-2 -fasm-blocks -D_DEBUG=$(DEBUGLEVEL)
DEBUGOPT_CXX = -O0 -g -gdwarf-2 -fasm-blocks -D_DEBUG=$(DEBUGLEVEL)
DEBUGOPT_LINK =
RELEASEOPT_CC = -DNDEBUG -Os -fasm-blocks
RELEASEOPT_CXX = -DNDEBUG -O2 -fasm-blocks
RELEASEOPT_LINK =
#
# System Specific Flags
#
SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64 -I$(OPENSSL_DIR)/include
#
# System Specific Libraries
#
SYSLIBS = -L$(OPENSSL_DIR)/lib -ldl
include $(POCO_BASE)/build/config/Darwin-clang

View File

@ -1,77 +0,0 @@
#
# $Id: //poco/1.4/build/config/Darwin-gcc#1 $
#
# Darwin
#
# Build settings for Mac OS X 10.6 (GCC 4.2)
# The build settings defined in this file are compatible
# with XCode 3.2.5 C++ projects.
#
# NOTE: This build configuration will build 64-bit binaries.
# Use the Darwin32 build configuration to build 32-bit binaries.
#
#
# General Settings
#
LINKMODE ?= SHARED
POCO_TARGET_OSARCH ?= x86_64
POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH)
ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH)
#
# Tools
#
CC = gcc
CXX = g++
LINK = $(CXX) -bind_at_load
LIB = libtool -static -o
RANLIB = ranlib
SHLIB = $(CXX) -dynamiclib -Wl,-install_name,$(POCO_LIB_INSTALLDIR)/$(notdir \$@) -o $@
DYLIB = $(CXX) -dynamic -bundle -bind_at_load -o $@
SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP =
DEP = $(POCO_BASE)/build/script/makedepend.gcc
SHELL = sh
RM = rm -rf
CP = cp
MKDIR = mkdir -p
#
# Extension for Shared Libraries
#
SHAREDLIBEXT = .$(target_version).dylib
SHAREDLIBLINKEXT = .dylib
#
# Compiler and Linker Flags
#
CFLAGS = $(ARCHFLAGS)
CXXFLAGS = $(ARCHFLAGS) -Wall -Wno-sign-compare
LINKFLAGS = $(ARCHFLAGS)
SHLIBFLAGS = $(ARCHFLAGS)
DYLIBFLAGS = $(ARCHFLAGS)
STATICOPT_CC =
STATICOPT_CXX =
STATICOPT_LINK =
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK =
DEBUGOPT_CC = -O0 -g -gdwarf-2 -D_DEBUG=$(DEBUGLEVEL)
DEBUGOPT_CXX = -O0 -g -gdwarf-2 -D_DEBUG=$(DEBUGLEVEL) -mfix-and-continue -fvisibility-inlines-hidden -fasm-blocks
DEBUGOPT_LINK =
RELEASEOPT_CC = -DNDEBUG -Os
RELEASEOPT_CXX = -DNDEBUG -Os -fvisibility-inlines-hidden -fasm-blocks
RELEASEOPT_LINK =
#
# System Specific Flags
#
SYSFLAGS = -DPOCO_HAVE_IPv6
#
# System Specific Libraries
#
SYSLIBS = -ldl

View File

@ -1,11 +1,10 @@
#
# $Id: //poco/1.4/build/config/Darwin32#2 $
# $Id
#
# Darwin32
#
# Build settings for Mac OS X 10.5/10.6 (GCC 4.0.1), 32-bits
# The build settings defined in this file are compatible
# with XCode 3.1 C++ projects.
# Build settings for Mac OS X 10.8 or later, clang, 32-bits, with C++11 support.
# Build settings are compatible with XCode 7 C++ projects.
#
ARCHFLAGS = -arch i386

View File

@ -1,11 +1,10 @@
#
# $Id: //poco/1.4/build/config/Darwin32-clang#1 $
# $Id$
#
# Darwin32
# Darwin32-clang
#
# Build settings for Mac OS X 10.5/10.6 (GCC 4.0.1), 32-bits
# The build settings defined in this file are compatible
# with XCode 3.1 C++ projects.
# Build settings for Mac OS X 10.8 or later, clang, 32-bits, with C++11 support.
# Build settings are compatible with XCode 7 C++ projects.
#
ARCHFLAGS = -arch i386

View File

@ -1,14 +1,15 @@
#
# $Id: //poco/1.4/build/config/Darwin32-clang#1 $
# $Id$
#
# Darwin32
# Darwin32-clang-libc++
#
# Build settings for Mac OS X 10.8 or later, clang, 32-bits, with C++11 support.
# Build settings are compatible with XCode 7 C++ projects.
#
# Note: provided for backwards compatibility.
#
# Build settings for Mac OS X 10.5/10.6 (GCC 4.0.1), 32-bits
# The build settings defined in this file are compatible
# with XCode 3.1 C++ projects.
#
ARCHFLAGS = -arch i386
POCO_TARGET_OSARCH = i386
include $(POCO_BASE)/build/config/Darwin-clang-libc++
include $(POCO_BASE)/build/config/Darwin-clang

View File

@ -1,14 +0,0 @@
#
# $Id: //poco/1.4/build/config/Darwin32-gcc#1 $
#
# Darwin32
#
# Build settings for Mac OS X 10.5/10.6 (GCC 4.0.1), 32-bits
# The build settings defined in this file are compatible
# with XCode 3.1 C++ projects.
#
ARCHFLAGS = -arch i386
POCO_TARGET_OSARCH = i386
include $(POCO_BASE)/build/config/Darwin

View File

@ -1,11 +1,10 @@
#
# $Id: //poco/1.4/build/config/Darwin64#2 $
# $Id
#
# Darwin64
#
# Build settings for Mac OS X 10.5/10.6 (GCC 4.0.1), 64-bits
# The build settings defined in this file are compatible
# with XCode 3.1 C++ projects.
# Build settings for Mac OS X 10.8 or later, clang, 64-bits, with C++11 support.
# Build settings are compatible with XCode 7 C++ projects.
#
ARCHFLAGS = -arch x86_64

View File

@ -1,11 +1,10 @@
#
# $Id: //poco/1.4/build/config/Darwin64-clang#1 $
# $Id$
#
# Darwin64
# Darwin64-clang
#
# Build settings for Mac OS X 10.5/10.6 (GCC 4.0.1), 64-bits
# The build settings defined in this file are compatible
# with XCode 3.1 C++ projects.
# Build settings for Mac OS X 10.8 or later, clang, 64-bits, with C++11 support.
# Build settings are compatible with XCode 7 C++ projects.
#
ARCHFLAGS = -arch x86_64

View File

@ -1,14 +1,15 @@
#
# $Id: //poco/1.4/build/config/Darwin64-clang#1 $
# $Id$
#
# Darwin64
# Darwin64-clang-libc++
#
# Build settings for Mac OS X 10.8 or later, clang, 64-bits, with C++11 support.
# Build settings are compatible with XCode 7 C++ projects.
#
# Note: provided for backwards compatibility.
#
# Build settings for Mac OS X 10.5/10.6 (GCC 4.0.1), 64-bits
# The build settings defined in this file are compatible
# with XCode 3.1 C++ projects.
#
ARCHFLAGS = -arch x86_64
POCO_TARGET_OSARCH = x86_64
include $(POCO_BASE)/build/config/Darwin-clang-libc++
include $(POCO_BASE)/build/config/Darwin-clang

View File

@ -1,14 +0,0 @@
#
# $Id: //poco/1.4/build/config/Darwin64-gcc#1 $
#
# Darwin64
#
# Build settings for Mac OS X 10.5/10.6 (GCC 4.0.1), 64-bits
# The build settings defined in this file are compatible
# with XCode 3.1 C++ projects.
#
ARCHFLAGS = -arch x86_64
POCO_TARGET_OSARCH = x86_64
include $(POCO_BASE)/build/config/Darwin