on master help sign in
Merge pull request #2310 from christopherschwaab/master
1843d02Niklas Larsson
config.mk+4−1
@@ -1,8 +1,11 @@
1CC ?=cc
1CC ?=cc
2+AR ?=ar
3+RANLIB ?=ranlib
4+
2CABAL :=cabal
5CABAL :=cabal
3# IDRIS_ENABLE_STATS should not be set in final release
6# IDRIS_ENABLE_STATS should not be set in final release
4# Any flags defined here which alter the RTS API must also be added to src/IRTS/CodegenC.hs
7# Any flags defined here which alter the RTS API must also be added to src/IRTS/CodegenC.hs
5−CFLAGS :=-O2 -Wall -DHAS_PTHREAD -DIDRIS_ENABLE_STATS -msse2 $(CFLAGS)
8+CFLAGS :=-O2 -Wall -DHAS_PTHREAD -DIDRIS_ENABLE_STATS $(CFLAGS)
6
9
7#CABALFLAGS :=
10#CABALFLAGS :=
8## Disable building of Effects
11## Disable building of Effects
rts/Makefile+2−2
@@ -30,8 +30,8 @@ LIBTARGET = libidris_rts.a
30build: $(LIBTARGET) $(DYLIBTARGET)
30build: $(LIBTARGET) $(DYLIBTARGET)
31
31
32$(LIBTARGET) : $(OBJS)
32$(LIBTARGET) : $(OBJS)
33− ar r $(LIBTARGET) $(OBJS)
33+ $(AR) r $(LIBTARGET) $(OBJS)
34− ranlib $(LIBTARGET)
34+ $(RANLIB) $(LIBTARGET)
35
35
36install :
36install :
37 mkdir -p $(TARGET)
37 mkdir -p $(TARGET)
src/IRTS/CodegenC.hs+1−1
@@ -77,7 +77,7 @@ codegenC' defs out exec incs objs libs flags exports iface dbg
77 let args = [gccDbg dbg] ++
77 let args = [gccDbg dbg] ++
78 gccFlags iface ++
78 gccFlags iface ++
79 -- # Any flags defined here which alter the RTS API must also be added to config.mk
79 -- # Any flags defined here which alter the RTS API must also be added to config.mk
80− ["-DHAS_PTHREAD", "-DIDRIS_ENABLE_STATS", "-msse2",
80+ ["-DHAS_PTHREAD", "-DIDRIS_ENABLE_STATS",
81 "-I."] ++ objs ++ ["-x", "c"] ++ envFlags ++
81 "-I."] ++ objs ++ ["-x", "c"] ++ envFlags ++
82 (if (exec == Executable) then [] else ["-c"]) ++
82 (if (exec == Executable) then [] else ["-c"]) ++
83 [tmpn] ++
83 [tmpn] ++