From 1bbda18695fe3b70a2aefd29888654d1114e2694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Tue, 18 Dec 2012 17:50:02 +0100 Subject: [PATCH] Inject FFLAGS, CFLAGS, LDFLAGS where missing --- Make.inc | 6 +++--- Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Make.inc b/Make.inc index 1a23747..32bf388 100644 --- a/Make.inc +++ b/Make.inc @@ -4,12 +4,12 @@ OS = $(shell uname) ARCH = $(shell uname -m) FC = gfortran -FFLAGS = -O3 +FFLAGS += -O3 USEGCC = 1 USECLANG = 0 -CFLAGS= -std=c99 -Wall -O3 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration +CFLAGS += -std=c99 -Wall -O3 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration ifeq ($(USECLANG),1) USEGCC = 0 @@ -25,7 +25,7 @@ endif default: all %.c.o: %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ %.f.o: %.f $(FC) $(FFLAGS) -c $< -o $@ diff --git a/Makefile b/Makefile index f3e5a63..49dde1e 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ all: libopenlibm.a libopenlibm.$(SHLIB_EXT) libopenlibm.a: $(OBJS) ar -rcs libopenlibm.a $(OBJS) libopenlibm.$(SHLIB_EXT): $(OBJS) - $(FC) -shared $(OBJS) -o libopenlibm.$(SHLIB_EXT) + $(FC) -shared $(OBJS) $(LDFLAGS) -o libopenlibm.$(SHLIB_EXT) distclean: rm -f $(OBJS) *.a *.$(SHLIB_EXT)