From 6c111d79944a43b41cd03e367e667ad14337ed40 Mon Sep 17 00:00:00 2001 From: alibrary Date: Thu, 9 Jun 2005 22:41:19 +0000 Subject: [PATCH] Update for MacOSX 10.4 --- build/Makefile.macosx | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/build/Makefile.macosx b/build/Makefile.macosx index c8e42706c02..39b8f4bff64 100644 --- a/build/Makefile.macosx +++ b/build/Makefile.macosx @@ -30,6 +30,7 @@ CXXNOOPT = $(NOOPT) COPT = $(OPT) FOPT = $(OPT) -fno-second-underscore + # CERNLIB defines CLIBDEFS = -DCERNLIB_LINUX -DCERNLIB_BLDLIB -DCERNLIB_CZ CLIBCXXOPTS = @@ -37,9 +38,21 @@ CLIBCOPT = CLIBFOPT = $(CLIBDEFS) # Compiler flags -CXXFLAGS = $(CXXOPT) -Wall -W -pipe -fsigned-char -fno-common -fweak-coalesced -fmessage-length=0 -I$(FINK_ROOT)/include -Wno-long-double #-Weffc++ -Woverloaded-virtual -CXXFLAGSNO = $(CXXNOOPT) -Wall -W -pipe -fsigned-char -fno-common -fweak-coalesced -fmessage-length=0 -I$(FINK_ROOT)/include -Wno-long-double -CFLAGS = $(COPT) -Wall -W -fno-common -fweak-coalesced -pipe -I$(FINK_ROOT)/include +CXXFLAGS = $(CXXOPT) -Wall -W -Wno-long-double -pipe -fsigned-char -fno-common -fmessage-length=0 -I$(FINK_ROOT)/include +ifneq ($(MACOSX_MINOR),4) +CXXFLAGS+=-fweak-coalesced +endif +ifeq (g95,$(findstring g95,$(ROOTBUILD))) +CXXFLAGS+=-DFORTRAN_G95 +endif +CXXFLAGSNO = $(CXXNOOPT) -Wall -W -pipe -fsigned-char -fno-common -fmessage-length=0 -I$(FINK_ROOT)/include -Wno-long-double +ifneq ($(MACOSX_MINOR),4) +CXXFLAGSNO+=-fweak-coalesced +endif +CFLAGS = $(COPT) -Wall -W -fno-common -pipe -I$(FINK_ROOT)/include +ifneq ($(MACOSX_MINOR),4) +CFLAGS+=-fweak-coalesced +endif FFLAGS = $(CLIBFOPT) $(FOPT) # rmkdepend flags for building dependencies of FORTRAN files DEPENDFFLAGS = $(FFLAGS) -- 2.39.3