on master help sign in
Take CFLAGS from environment in Makefiles
58bb8e0Benjamin Saunders
config.mk+1
@@ -1,6 +1,7 @@
1GMP_INCLUDE_DIR :=
1GMP_INCLUDE_DIR :=
2CC :=gcc
2CC :=gcc
3CABAL :=cabal
3CABAL :=cabal
4+CFLAGS :=-O2 -Wall $(CFLAGS)
4#CABALFLAGS :=
5#CABALFLAGS :=
5## Disable building of Effects
6## Disable building of Effects
6#CABALFLAGS :=-f NoEffects
7#CABALFLAGS :=-f NoEffects
llvm/Makefile+2−2
@@ -1,6 +1,6 @@
1include ../config.mk
1include ../config.mk
2
2
3−CFLAGS=-c -O2 -Wall -Wextra -fPIC -Wno-unused-parameter
3+CFLAGS:=-Wextra -fPIC -Wno-unused-parameter $(CFLAGS)
4SOURCES=defs.c
4SOURCES=defs.c
5OBJECTS=$(SOURCES:.c=.o)
5OBJECTS=$(SOURCES:.c=.o)
6LIB=libidris_rts.a
6LIB=libidris_rts.a
@@ -12,7 +12,7 @@ $(LIB): $(OBJECTS)
12 ranlib $@
12 ranlib $@
13
13
14.c.o:
14.c.o:
15− $(CC) $(CFLAGS) $< -o $@
15+ $(CC) -c $(CFLAGS) $< -o $@
16
16
17install: $(LIB) .PHONY
17install: $(LIB) .PHONY
18 mkdir -p $(TARGET)
18 mkdir -p $(TARGET)
rts/Makefile+1−2
@@ -2,8 +2,7 @@ include ../config.mk
2
2
3OBJS = idris_rts.o idris_heap.o idris_gc.o idris_gmp.o idris_stdfgn.o idris_bitstring.o idris_opts.o idris_stats.o
3OBJS = idris_rts.o idris_heap.o idris_gc.o idris_gmp.o idris_stdfgn.o idris_bitstring.o idris_opts.o idris_stats.o
4HDRS = idris_rts.h idris_heap.h idris_gc.h idris_gmp.h idris_stdfgn.h idris_bitstring.h idris_opts.h idris_stats.h
4HDRS = idris_rts.h idris_heap.h idris_gc.h idris_gmp.h idris_stdfgn.h idris_bitstring.h idris_opts.h idris_stats.h
5−CFLAGS = -O2 -Wall -fPIC
5+CFLAGS:=-fPIC $(CFLAGS)
6−
7ifneq ($(GMP_INCLUDE_DIR),)
6ifneq ($(GMP_INCLUDE_DIR),)
8 CFLAGS += -isystem $(GMP_INCLUDE_DIR)
7 CFLAGS += -isystem $(GMP_INCLUDE_DIR)
9endif
8endif