Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-20 14:19:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build fixes from bakul

Browse source
This commit is contained in:
Alex Shinn 2011-08-01 08:31:30 +09:00
parent 366c88bce1
commit 7a04cf809d
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -31,6 +31,9 @@ ifndef PLATFORM
ifeq ($(shell uname),Darwin) ifeq ($(shell uname),Darwin)
PLATFORM=macosx PLATFORM=macosx
else else
ifeq ($(shell uname),FreeBSD)
PLATFORM=FreeBSD
else
ifeq ($(shell uname -o),Msys) ifeq ($(shell uname -o),Msys)
PLATFORM=mingw PLATFORM=mingw
SOLIBDIR = $(BINDIR) SOLIBDIR = $(BINDIR)
@ -50,6 +53,7 @@ endif
endif endif
endif endif
endif endif
endif
ifeq ($(PLATFORM),macosx) ifeq ($(PLATFORM),macosx)
SO = .dylib SO = .dylib
@ -79,6 +83,10 @@ SO = .so
EXE = EXE =
CLIBFLAGS = -fPIC -shared CLIBFLAGS = -fPIC -shared
STATICFLAGS = -static -DSEXP_USE_DL=0 STATICFLAGS = -static -DSEXP_USE_DL=0
ifeq ($(PLATFORM),FreeBSD)
LIBDL=
RLDFLAGS=-Wl,-R$(DESTDIR)$(LIBDIR)
endif
endif endif
endif endif
endif endif
@ -207,7 +215,7 @@ test-basic: chibi-scheme$(EXE)
done done
test-build: test-build:
./tests/build/build-tests.sh MAKE=$(MAKE) ./tests/build/build-tests.sh
test-threads: chibi-scheme$(EXE) lib/srfi/18/threads$(SO) lib/srfi/39/param$(SO) lib/srfi/98/env$(SO) lib/chibi/ast$(SO) lib/chibi/time$(SO) test-threads: chibi-scheme$(EXE) lib/srfi/18/threads$(SO) lib/srfi/39/param$(SO) lib/srfi/98/env$(SO) lib/chibi/ast$(SO) lib/chibi/time$(SO)
$(CHIBI) tests/thread-tests.scm $(CHIBI) tests/thread-tests.scm

7
tests/build/build-tests.sh
View file

@ -11,12 +11,13 @@
BUILDDIR=tests/build BUILDDIR=tests/build
FAILURES=0 FAILURES=0
MAKE=${MAKE:-make}
i=0 i=0
for opts in `cat ${BUILDDIR}/build-opts.txt`; do for opts in `cat ${BUILDDIR}/build-opts.txt`; do
make cleaner 2>&1 >/dev/null $MAKE cleaner 2>&1 >/dev/null
if make $opts chibi-scheme 2>&1 >${BUILDDIR}/build${i}-make.out; then if $MAKE $opts chibi-scheme 2>&1 >${BUILDDIR}/build${i}-make.out; then
if make test 2>&1 | tee ${BUILDDIR}/build${i}-test.out | grep -q -E 'FAIL|ERROR'; then if $MAKE test 2>&1 | tee ${BUILDDIR}/build${i}-test.out | grep -q -E 'FAIL|ERROR'; then
echo "[FAIL] ${i}: tests failed with $opts" echo "[FAIL] ${i}: tests failed with $opts"
FAILURES=$((FAILURES + 1)) FAILURES=$((FAILURES + 1))
else else