git.iko.soy/Idris-dev
on master help sign in
Merge pull request #2310 from christopherschwaab/master

Remove -msse2 and hardcoded ar, ranlib paths.

commit1843d02810a0060032ab66029784b7a571db1096 authorNiklas Larsson <metaniklas@gmail.com> dateFri 22 May 2015, 14:14 (11 years ago) parente426fa22b0224a
3 files changed+7−4
compare with master
unifiedsplit
config.mk+4−1 rts/Makefile+2−2 src/IRTS/CodegenC.hs+1−1
config.mk+4−1
@@ -1,8 +1,11 @@
11CC ?=cc
2+AR ?=ar
3+RANLIB ?=ranlib
4+
25CABAL :=cabal
36# IDRIS_ENABLE_STATS should not be set in final release
47# 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)
69
710#CABALFLAGS :=
811## Disable building of Effects
rts/Makefile+2−2
@@ -30,8 +30,8 @@ LIBTARGET = libidris_rts.a
3030build: $(LIBTARGET) $(DYLIBTARGET)
3131
3232$(LIBTARGET) : $(OBJS)
33− ar r $(LIBTARGET) $(OBJS)
34− ranlib $(LIBTARGET)
33+ $(AR) r $(LIBTARGET) $(OBJS)
34+ $(RANLIB) $(LIBTARGET)
3535
3636install :
3737 mkdir -p $(TARGET)
src/IRTS/CodegenC.hs+1−1
@@ -77,7 +77,7 @@ codegenC' defs out exec incs objs libs flags exports iface dbg
7777 let args = [gccDbg dbg] ++
7878 gccFlags iface ++
7979 -- # 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",
8181 "-I."] ++ objs ++ ["-x", "c"] ++ envFlags ++
8282 (if (exec == Executable) then [] else ["-c"]) ++
8383 [tmpn] ++