~ chicken-core (chicken-5) f1a0e50df11314348ea7e99ceb050f5193959042

commit f1a0e50df11314348ea7e99ceb050f5193959042
Merge: fac09ea8 541035ef
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Apr 10 10:57:58 2017 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Mon Apr 10 10:57:58 2017 +0200

    Merge remote-tracking branch 'origin/chicken-5' into chicken-5-new-egg-install
    
    Conflicts:
            chicken-install.scm
            csc.scm
            eval.scm
            tests/runtests.sh

diff --cc csc.scm
index 8edcadf7,e8cc7418..57e05f83
--- a/csc.scm
+++ b/csc.scm
@@@ -108,22 -132,14 +108,21 @@@
  (define pic-options (if (or mingw cygwin) '("-DPIC") '("-fPIC" "-DPIC")))
  (define generate-manifest #f)
  
 -(define libchicken (string-append "lib" INSTALL_LIB_NAME))
 -(define dynamic-libchicken
 +(define (libchicken)
 +  (string-append "lib"
 +                 (if (not host-mode)
 +                     TARGET_LIB_NAME
 +                     INSTALL_LIB_NAME)))
 +
 +(define (dynamic-libchicken)
    (if cygwin
 -      (string-append "cyg" INSTALL_LIB_NAME "-0")
 -      libchicken))
 +      (string-append "cyg" INSTALL_LIB_NAME "-0")  ; XXX not target
 +      (libchicken)))
  
 -(define default-compilation-optimization-options (string-split (if host-mode INSTALL_CFLAGS TARGET_CFLAGS)))
 -(define best-compilation-optimization-options default-compilation-optimization-options)
 +(define (default-library)
 +  (string-append (libchicken) "." library-extension))
 +
- (define default-compilation-optimization-options (string-split (if host-mode host-cflags default-cflags)))
- (define best-compilation-optimization-options default-compilation-optimization-options)
++(define default-compilation-optimization-options (string-split (if host-mode host-(define best-compilation-optimization-options default-compilation-optimization-options)
  (define default-linking-optimization-options (string-split (if host-mode INSTALL_LDFLAGS TARGET_LDFLAGS)))
  (define best-linking-optimization-options default-linking-optimization-options)
  (define extra-features (if host-mode '() (string-split TARGET_FEATURES)))
diff --cc defaults.make
index e87e956a,37f69a37..e063157d
--- a/defaults.make
+++ b/defaults.make
@@@ -264,10 -264,10 +264,10 @@@ CHICKEN_PROGRAM_OPTIONS += $(if $(PROFI
  # import libraries
  
  PRIMITIVE_IMPORT_LIBRARIES = chicken chicken.csi chicken.foreign
 -DYNAMIC_IMPORT_LIBRARIES = setup-api setup-download srfi-4
 +DYNAMIC_IMPORT_LIBRARIES = srfi-4
  DYNAMIC_CHICKEN_IMPORT_LIBRARIES = bitwise errno file.posix fixnum flonum \
  	format gc io keyword locative memory posix pretty-print process \
- 	process.signal random time time.posix
+ 	process.signal process-context random time time.posix
  DYNAMIC_CHICKEN_COMPILER_IMPORT_LIBRARIES = user-pass
  DYNAMIC_CHICKEN_UNIT_IMPORT_LIBRARIES = continuation data-structures \
  	eval expand file files internal irregex lolevel pathname port \
diff --cc tests/runtests.sh
index 5607480b,74e7ecfa..cc2d5d93
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@@ -32,9 -32,49 +32,8 @@@ esa
  
  rm -fr test-repository
  mkdir -p test-repository
 -
 -# copy files into test-repository (by hand to avoid calling `chicken-install'):
 -
 -for x in \
 -    chicken.import.so types.db \
 -    setup-api.so setup-api.import.so srfi-4.import.so \
 -    setup-download.so setup-download.import.so \
 -    chicken.bitwise.import.so \
 -    chicken.continuation.import.so \
 -    chicken.csi.import.so \
 -    chicken.data-structures.import.so \
 -    chicken.files.import.so \
 -    chicken.flonum.import.so \
 -    chicken.foreign.import.so \
 -    chicken.format.import.so \
 -    chicken.gc.import.so \
 -    chicken.internal.import.so \
 -    chicken.io.import.so \
 -    chicken.irregex.import.so \
 -    chicken.keyword.import.so \
 -    chicken.locative.import.so \
 -    chicken.lolevel.import.so \
 -    chicken.memory.import.so \
 -    chicken.pathname.import.so \
 -    chicken.port.import.so \
 -    chicken.posix.import.so \
 -    chicken.pretty-print.import.so \
 -    chicken.process.import.so \
 -    chicken.random.import.so \
 -    chicken.repl.import.so \
 -    chicken.read-syntax.import.so \
 -    chicken.tcp.import.so \
 -    chicken.time.import.so
 -do
 -    cp ../$x test-repository
 -done
 -
 -CHICKEN_REPOSITORY=${TEST_DIR}/test-repository
 -CHICKEN_PREFIX=${TEST_DIR}/..
 -
 -export CHICKEN_REPOSITORY
 -export CHICKEN_PREFIX
--
 +CHICKEN_INSTALL_REPOSITORY=${TEST_DIR}/test-repository
 +CHICKEN_REPOSITORY_PATH=${TEST_DIR}/..:$CHICKEN_INSTALL_REPOSITORY
  CHICKEN=${TEST_DIR}/../chicken
  CHICKEN_PROFILE=${TEST_DIR}/../chicken-profile
  CHICKEN_INSTALL=${TEST_DIR}/../chicken-install