Merge pull request #432 from Ralith/cflags
Take CFLAGS from environment in Makefiles
commit8cbc717a36039a370c702439315f4c4fb88b7d01
authorEdwin Brady <edwin.brady@gmail.com>
dateSat 3 Aug 2013, 09:46 (13 years ago)
parent0558972d64094c
.travis.yml+2−2
@@ -6,8 +6,8 @@ before_install:
66 - sudo apt-get install -qq libgc-dev llvm-3.3
77before_script:
88 - cabal sdist
9− - cd ../..
10− - tar -xf edwinb/Idris-dev/dist/idris*.tar.gz
9+ - cd ..
10+ - tar -xf Idris-dev/dist/idris*.tar.gz
1111 - cd idris*
1212script:
1313 - cabal configure
config.mk+1
@@ -1,6 +1,7 @@
11GMP_INCLUDE_DIR :=
22CC :=gcc
33CABAL :=cabal
4+CFLAGS :=-O2 -Wall $(CFLAGS)
45#CABALFLAGS :=
56## Disable building of Effects
67#CABALFLAGS :=-f NoEffects
llvm/Makefile+2−2
@@ -1,6 +1,6 @@
11include ../config.mk
22
3−CFLAGS=-c -O2 -Wall -Wextra -fPIC -Wno-unused-parameter
3+CFLAGS:=-Wextra -fPIC -Wno-unused-parameter $(CFLAGS)
44SOURCES=defs.c
55OBJECTS=$(SOURCES:.c=.o)
66LIB=libidris_rts.a
@@ -12,7 +12,7 @@ $(LIB): $(OBJECTS)
1212 ranlib $@
1313
1414.c.o:
15− $(CC) $(CFLAGS) $< -o $@
15+ $(CC) -c $(CFLAGS) $< -o $@
1616
1717install: $(LIB) .PHONY
1818 mkdir -p $(TARGET)
rts/Makefile+1−2
@@ -2,8 +2,7 @@ include ../config.mk
22
33OBJS = idris_rts.o idris_heap.o idris_gc.o idris_gmp.o idris_stdfgn.o idris_bitstring.o idris_opts.o idris_stats.o
44HDRS = 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
6−
5+CFLAGS:=-fPIC $(CFLAGS)
76ifneq ($(GMP_INCLUDE_DIR),)
87 CFLAGS += -isystem $(GMP_INCLUDE_DIR)
98endif