From e8536ccaf71c0e6a4655d790cfe540a342fb1497 Mon Sep 17 00:00:00 2001 From: "W. Eric Norum" Date: Tue, 26 Mar 2002 18:00:13 +0000 Subject: [PATCH] Small change to clean up the way flags are set and to prepare for addition of shared libraries. --- config/CONFIG_SITE.Host.darwin-ppc | 2 +- configure/os/CONFIG.Common.darwin-ppc | 13 +++++++++++++ configure/os/CONFIG.darwin-ppc.darwin-ppc | 10 ++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/config/CONFIG_SITE.Host.darwin-ppc b/config/CONFIG_SITE.Host.darwin-ppc index 6c46b8cff..26f82b18f 100644 --- a/config/CONFIG_SITE.Host.darwin-ppc +++ b/config/CONFIG_SITE.Host.darwin-ppc @@ -2,4 +2,4 @@ -include $(EPICS_BASE)/config/CONFIG_SITE.Host.Darwin -SHARED_LIBRARY=NO +SHARED_LIBRARIES=NO diff --git a/configure/os/CONFIG.Common.darwin-ppc b/configure/os/CONFIG.Common.darwin-ppc index 4c4c3eae0..e48bc1263 100644 --- a/configure/os/CONFIG.Common.darwin-ppc +++ b/configure/os/CONFIG.Common.darwin-ppc @@ -18,6 +18,13 @@ ARCH_CLASS = ppc # SHARED_LIBRARIES=NO +# +# Special flags for Darwin +# No fancy precompiled headers +# No common blocks (as required when going to shared libraries) +# +OP_SYS_CFLAGS += -no-cpp-precomp -fno-common + # # Need to get some fink-installed packages (readline, etc.). # If you don't have readline on your system you must remove @@ -27,3 +34,9 @@ SHARED_LIBRARIES=NO OP_SYS_CPPFLAGS += -I$(FINK_DIR)/include OP_SYS_LDFLAGS += -L$(FINK_DIR)/lib OP_SYS_LDLIBS += -lreadline + +# +# Stuff that will be needed when going to shared libraries +# +SHRLIB_LDFLAGS = -dynamiclib +SHRLIB_SUFFIX = $(addprefix .,$(SHRLIB_VERSION)).dylib diff --git a/configure/os/CONFIG.darwin-ppc.darwin-ppc b/configure/os/CONFIG.darwin-ppc.darwin-ppc index 02933c03a..2d9b8c50c 100644 --- a/configure/os/CONFIG.darwin-ppc.darwin-ppc +++ b/configure/os/CONFIG.darwin-ppc.darwin-ppc @@ -11,5 +11,11 @@ include $(CONFIG)/CONFIG.gnuCommon GNU_DIR = /usr -CC = $(GNU_BIN)/cc -no-cpp-precomp -CCC = $(GNU_BIN)/c++ -no-cpp-precomp +CC = $(GNU_BIN)/cc +CCC = $(GNU_BIN)/c++ + +# +# Position-independent code is the default on Darwin. +# +CODE_CFLAGS = +CODE_CXXFLAGS =