mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-06-26 23:23:16 +00:00
Code Issues 1 Releases Wiki Activity

Update to work on CENTOS.

Browse Source
This commit is contained in:
Calvin Rose 2018-09-10 14:21:08 -04:00
parent bf36182a23
commit a86540a876
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -22,7 +22,7 @@
##### Set global variables ##### ##### Set global variables #####
################################ ################################
PREFIX?=/usr PREFIX?=/usr/local
INCLUDEDIR=$(PREFIX)/include/janet INCLUDEDIR=$(PREFIX)/include/janet
LIBDIR=$(PREFIX)/lib LIBDIR=$(PREFIX)/lib
@ -34,8 +34,7 @@ BINDIR=$(PREFIX)/bin
#CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -fpic -g #CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -fpic -g
CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -fpic -O2 -fvisibility=hidden CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -fpic -O2 -fvisibility=hidden
CLIBS=-lm -ldl CLIBS=-lm -ldl -lrt
PREFIX=/usr/local
JANET_TARGET=janet JANET_TARGET=janet
JANET_LIBRARY=libjanet.so JANET_LIBRARY=libjanet.so
DEBUGGER=gdb DEBUGGER=gdb
@ -148,9 +147,11 @@ clean:
-rm $(JANET_GENERATED_HEADERS) -rm $(JANET_GENERATED_HEADERS)
install: $(JANET_TARGET) install: $(JANET_TARGET)
mkdir -p $(BINDIR)
cp $(JANET_TARGET) $(BINDIR)/$(JANET_TARGET) cp $(JANET_TARGET) $(BINDIR)/$(JANET_TARGET)
mkdir -p $(INCLUDEDIR) mkdir -p $(INCLUDEDIR)
cp $(JANET_HEADERS) $(INCLUDEDIR) cp $(JANET_HEADERS) $(INCLUDEDIR)
mkdir -p $(LIBDIR)
cp $(JANET_LIBRARY) $(LIBDIR)/$(JANET_LIBRARY) cp $(JANET_LIBRARY) $(LIBDIR)/$(JANET_LIBRARY)
$(LDCONFIG) $(LDCONFIG)

10
src/core/core.janet
View File

@ -233,8 +233,8 @@
true true
((fn aux [i] ((fn aux [i]
(cond (cond
(>= (inc i) len) (get forms i) (>= (+ 1 i) len) (get forms i)
(tuple 'if (get forms i) (aux (inc i)) false))) 0))) (tuple 'if (get forms i) (aux (+ 1 i)) false))) 0)))
(defmacro or (defmacro or
"Evaluates to the last argument if all preceding elements are false, otherwise "Evaluates to the last argument if all preceding elements are false, otherwise
@ -246,14 +246,14 @@
((fn aux [i] ((fn aux [i]
(def fi (get forms i)) (def fi (get forms i))
(if (if
(>= (inc i) len) fi (>= (+ 1 i) len) fi
(do (do
(if (atomic? fi) (if (atomic? fi)
(tuple 'if fi fi (aux (inc i))) (tuple 'if fi fi (aux (+ 1 i)))
(do (do
(def $fi (gensym)) (def $fi (gensym))
(tuple 'do (tuple 'def $fi fi) (tuple 'do (tuple 'def $fi fi)
(tuple 'if $fi $fi (aux (inc i))))))))) 0))) (tuple 'if $fi $fi (aux (+ 1 i))))))))) 0)))
(defmacro loop (defmacro loop
"A general purpose loop macro." "A general purpose loop macro."