From 7b589b0e278af59e31768df05c1cf7fd05e22dae Mon Sep 17 00:00:00 2001 From: "W. Eric Norum" Date: Wed, 26 Mar 2003 21:52:47 +0000 Subject: [PATCH] Don't want gnuCommon -shared flag on Darwin. --- configure/os/CONFIG.Common.darwin-ppc | 10 ---------- configure/os/CONFIG.darwin-ppc.darwin-ppc | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure/os/CONFIG.Common.darwin-ppc b/configure/os/CONFIG.Common.darwin-ppc index 61b5718b7..067ff43a3 100644 --- a/configure/os/CONFIG.Common.darwin-ppc +++ b/configure/os/CONFIG.Common.darwin-ppc @@ -33,16 +33,6 @@ CPPSNCFLAGS += -no-cpp-precomp OP_SYS_CPPFLAGS += -I$(FINK_DIR)/include OP_SYS_LDFLAGS += -L$(FINK_DIR)/lib -# -# Stuff that will be needed when going to shared libraries -# -SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \ - -install_name $(firstword $(SHRLIB_SEARCH_DIRS))/$@ \ - -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \ - -current_version $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION) -SHRLIB_SUFFIX = $(addprefix .,$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)).dylib -SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION) - # # Command-line input support # Install the fink libtecla1 package and uncomment the diff --git a/configure/os/CONFIG.darwin-ppc.darwin-ppc b/configure/os/CONFIG.darwin-ppc.darwin-ppc index b67f1571c..7eeed57bc 100644 --- a/configure/os/CONFIG.darwin-ppc.darwin-ppc +++ b/configure/os/CONFIG.darwin-ppc.darwin-ppc @@ -14,6 +14,16 @@ GNU_DIR = /usr CC = $(GNU_BIN)/cc CCC = $(GNU_BIN)/c++ +# +# Darwin shared libraries +# +SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \ + -install_name $(firstword $(SHRLIB_SEARCH_DIRS))/$@ \ + -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \ + -current_version $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION) +SHRLIB_SUFFIX = $(addprefix .,$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)).dylib +SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION) + # # Position-independent code is the default on Darwin. #