epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Build universal binaries, allowing sites to configure what to include.

Browse Source
This commit is contained in:
Andrew Johnson
2009-05-06 17:25:01 +00:00
parent 7adda5d417
commit a695c4a45a
11 changed files with 70 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure/os/CONFIG.Common.darwin-ppc
View File

@@ -8,9 +8,8 @@
#-------------------------------------------------------
#
# Architecture-specific information
#
ARCH_CLASS = ppc
# To build universal binaries, configure ARCH_CLASS
# in the file CONFIG_SITE.Common.darwin-ppc
# Include definitions common to all Darwin targets
include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

13
configure/os/CONFIG.Common.darwin-ppcx86
View File

@@ -3,20 +3,13 @@
# $Id$
# This file is maintained by the build community.
#
# Definitions for Darwin 'universal' (PowerPC, Intel) target builds
# Definitions for Darwin universal PowerPC + x86 target builds
# Sites may override these definitions in CONFIG_SITE.Common.darwin-ppcx86
#-------------------------------------------------------
#
# Set architecture-specific information
#
ARCH_CLASS = ppcx86
#
# Universal binary support
#
OP_SYS_CFLAGS += -arch i386 -arch ppc
OP_SYS_LDFLAGS += -arch i386 -arch ppc
# To build universal binaries, configure ARCH_CLASS
# in the file CONFIG_SITE.Common.darwin-ppcx86
# Include definitions common to all Darwin targets
include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

5
configure/os/CONFIG.Common.darwin-x86
View File

@@ -8,9 +8,8 @@
#-------------------------------------------------------
#
# Architecture-specific information
#
ARCH_CLASS = x86
# To build universal binaries, configure ARCH_CLASS
# in the file CONFIG_SITE.Common.darwin-x86
# Include definitions common to all Darwin targets
include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

2
configure/os/CONFIG.darwin-ppcx86.Common
View File

@@ -3,7 +3,7 @@
# $Id$
# This file is maintained by the build community.
#
# Definitions for Darwin 'universal' (PowerPC, Intel) host builds
# Definitions for Darwin universal PowerPC + x86 host builds
# Sites may override these definitions in CONFIG_SITE.darwin-ppcx86.Common
#-------------------------------------------------------

16
configure/os/CONFIG.darwinCommon.darwinCommon
View File

@@ -3,8 +3,8 @@
# $Id$
# This file is maintained by the build community.
#
# Definitions for darwin target builds
# Sites may override these definitions in CONFIG_SITE.Common.darwin-<arch>
# Common definitions for darwin builds
# Sites may override these definitions in CONFIG_SITE.darwinCommon.darwinCommon
#-------------------------------------------------------
# Include definitions common to all Unix targets
@@ -18,6 +18,18 @@ include $(CONFIG)/CONFIG.gnuCommon
#
OS_CLASS = Darwin
#
# Build architecture flags
# For Darwin, ARCH_CLASS may be empty, or may contain a list of CPU
# architectures which must be valid arguments to the -arch options
# for the cc and ld commands.
# ARCH_CLASS is defined in a CONFIG_SITE file which is not loaded
# until after this file.
#
ARCH_DEP_FLAGS = $(addprefix -arch ,$(ARCH_CLASS))
ARCH_DEP_CFLAGS += $(ARCH_DEP_FLAGS)
ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS)
#
# Special flags for Darwin
# No common blocks (as required when using shared libraries)

14
configure/os/CONFIG_SITE.Common.darwin-ppc Normal file
View File

@@ -0,0 +1,14 @@
# CONFIG_SITE.Common.darwin-ppc
#
# $Id$
# This file is maintained by the build community.
#
# Site override definitions for darwin-ppc target builds
#-------------------------------------------------------
# Select which CPU architectures to include in your universal binaries:
# ppc
# ppc64 - Not tested
ARCH_CLASS = ppc
#ARCH_CLASS = ppc ppc64

18
configure/os/CONFIG_SITE.Common.darwin-ppcx86 Normal file
View File

@@ -0,0 +1,18 @@
# CONFIG_SITE.Common.darwin-ppcx86
#
# $Id$
# This file is maintained by the build community.
#
# Site override definitions for darwin-ppcx86 target builds
#----------------------------------------------------------
# Select which CPU architectures to include in your universal binaries:
# ppc
# i386
# ppc64 - Not tested
# x86_64 - Needs MacOS 10.5 or 10.4 with Universal SDK
ARCH_CLASS = ppc i386
#ARCH_CLASS = ppc i386 x86_64
#ARCH_CLASS = ppc ppc64 i386
#ARCH_CLASS = ppc ppc64 i386 x86_64

14
configure/os/CONFIG_SITE.Common.darwin-x86 Normal file
View File

@@ -0,0 +1,14 @@
# CONFIG_SITE.Common.darwin-x86
#
# $Id$
# This file is maintained by the build community.
#
# Site override definitions for darwin-x86 target builds
#-------------------------------------------------------
# Select which CPU architectures to include in your universal binaries:
# i386
# x86_64 - Needs MacOS 10.5 or 10.4 with Universal SDK
ARCH_CLASS = i386
#ARCH_CLASS = i386 x86_64

2
configure/os/CONFIG_SITE.darwin-ppc.Common
View File

@@ -5,5 +5,3 @@
#
# Site override definitions for darwin-ppc host builds
#-------------------------------------------------------
CROSS_COMPILER_TARGET_ARCHS = # RTEMS-uC5282 RTEMS-mvme5500 RTEMS-mvme2100

5
configure/os/CONFIG_SITE.darwin-ppcx86.Common
View File

@@ -5,8 +5,3 @@
#
# Site override definitions for darwin-ppcx86 host builds
#-------------------------------------------------------
#
# Need this to get OS X readline rather than Fink (PPC-only) readline
#
OP_SYS_LDFLAGS += -L/usr/lib

6
configure/os/CONFIG_SITE.darwin-x86.Common
View File

@@ -1,9 +1,7 @@
# CONFIG_SITE.darwin-ppc.Common
# CONFIG_SITE.darwin-x86.Common
#
# $Id$
# This file is maintained by the build community.
#
# Site override definitions for darwin-ppc host builds
# Site override definitions for darwin-x86 host builds
#-------------------------------------------------------
CROSS_COMPILER_TARGET_ARCHS = # RTEMS-uC5282 # RTEMS-mvme5500 RTEMS-mvme2100