mirrors/pgloader
1
0
Fork 0
mirror of https://github.com/dimitri/pgloader.git synced 2026-05-05 19:06:11 +02:00
Code Issues Projects Releases Wiki Activity

Fix buildapp dependency.

Browse Source 
We need a different buildapp binary file for SBCL and for CCL, so make
it appear that way in the Makefile, and have both
./build/bin/buildapp.sbcl and ./build/bin/buildapp.ccl.

That avoid really confusing error messages when trying to build pgloader
with CCL and using the SBCL-compiled buildapp binary...
This commit is contained in:
Dimitri Fontaine 2014-05-03 15:45:42 +02:00
parent e39788e5cd
commit ad18c5370d
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile
View File

@ -4,9 +4,20 @@ APP_NAME = pgloader
# use either sbcl or ccl
CL = sbcl
BUILDDIR = build
LIBS = $(BUILDDIR)/libs.stamp
QLDIR = $(BUILDDIR)/quicklisp
MANIFEST = $(BUILDDIR)/manifest.ql
PGLOADER = $(BUILDDIR)/bin/$(APP_NAME)
BUILDAPP_CCL = $(BUILDDIR)/bin/buildapp.ccl
BUILDAPP_SBCL = $(BUILDDIR)/bin/buildapp.sbcl
ifeq ($(CL),sbcl)
BUILDAPP = $(BUILDAPP_SBCL)
CL_OPTS = --no-sysinit --no-userinit
else
BUILDAPP = $(BUILDAPP_CCL)
CL_OPTS = --no-init
endif
@ -26,14 +37,6 @@ BUILDAPP_OPTS = --require sb-posix \
--require sb-rotate-byte
endif
BUILDDIR = build
LIBS = $(BUILDDIR)/libs.stamp
BUILDAPP = $(BUILDDIR)/bin/buildapp
MANIFEST = $(BUILDDIR)/manifest.ql
PGLOADER = $(BUILDDIR)/bin/$(APP_NAME)
QLDIR = $(BUILDDIR)/quicklisp
DEBUILD_ROOT = /tmp/pgloader
all: $(PGLOADER)
@ -71,11 +74,18 @@ $(MANIFEST): $(LIBS)
manifest: $(MANIFEST) ;
$(BUILDAPP): $(QLDIR)/setup.lisp
$(BUILDAPP_CCL): $(QLDIR)/setup.lisp
mkdir -p $(BUILDDIR)/bin
$(CL) $(CL_OPTS) --load $(QLDIR)/setup.lisp \
--eval '(ql:quickload "buildapp")' \
--eval '(buildapp:build-buildapp "$(BUILDAPP)")' \
--eval '(buildapp:build-buildapp "$@")' \
--eval '(quit)'
$(BUILDAPP_SBCL): $(QLDIR)/setup.lisp
mkdir -p $(BUILDDIR)/bin
$(CL) $(CL_OPTS) --load $(QLDIR)/setup.lisp \
--eval '(ql:quickload "buildapp")' \
--eval '(buildapp:build-buildapp "$@")' \
--eval '(quit)'
buildapp: $(BUILDAPP) ;