~ chicken-core (chicken-5) ae2b5c9166f3c5e480112b4aba1a7c2188dfe232
commit ae2b5c9166f3c5e480112b4aba1a7c2188dfe232
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Fri Sep 10 13:05:11 2010 +0200
Commit: Peter Bex <Peter.Bex@xs4all.nl>
CommitDate: Fri Sep 10 16:41:44 2010 +0200
cygwin build fixes (sort of)
diff --git a/Makefile.cygwin b/Makefile.cygwin
index 0cb73647..a24ba45c 100644
--- a/Makefile.cygwin
+++ b/Makefile.cygwin
@@ -60,7 +60,7 @@ endif
endif
C_COMPILER_SHARED_OPTIONS = -DPIC
LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
-LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,--dll-search-prefix=cyg -Wl,--export-dynamic
+LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,--dll-search-prefix=cyg
LIBCHICKEN_SO_LINKER_OPTIONS = -Wl,--out-implib,libchicken.dll.a \
-Wl,--export-all-symbols \
-Wl,--enable-auto-import \
@@ -155,7 +155,7 @@ chicken-defaults.h:
echo "# define C_INSTALL_EGG_HOME \"$(EGGDIR)\"" >>$@
echo "#endif" >>$@
echo "#ifndef C_INSTALL_LIB_HOME" >>$@
- echo "# define C_INSTALL_LIB_HOME \"$(BINDIR)\"" >>$@
+ echo "# define C_INSTALL_LIB_HOME \"$(LIBDIR)\"" >>$@
echo "#endif" >>$@
echo "#ifndef C_INSTALL_STATIC_LIB_HOME" >>$@
echo "# define C_INSTALL_STATIC_LIB_HOME \"$(LIBDIR)\"" >>$@
@@ -212,7 +212,7 @@ chicken-defaults.h:
echo "# define C_TARGET_BIN_HOME \"$(TARGET_PREFIX)/bin\"" >>$@
echo "#endif" >>$@
echo "#ifndef C_TARGET_LIB_HOME" >>$@
- echo "# define C_TARGET_LIB_HOME \"$(TARGET_PREFIX)/bin\"" >>$@
+ echo "# define C_TARGET_LIB_HOME \"$(TARGET_PREFIX)/lib\"" >>$@
echo "#endif" >>$@
echo "#ifndef C_TARGET_RUN_LIB_HOME" >>$@
echo "# define C_TARGET_RUN_LIB_HOME \"$(TARGET_RUN_PREFIX)/bin\"" >>$@
diff --git a/rules.make b/rules.make
index 7e0810b2..5c6be9d2 100644
--- a/rules.make
+++ b/rules.make
@@ -216,7 +216,7 @@ cygchicken-0.dll: $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
gcc -shared -o $(LIBCHICKEN_SO_FILE) -Wl,--dll -Wl,--add-stdcall-alias \
-Wl,--enable-stdcall-fixup -Wl,--warn-unresolved-symbols \
-Wl,--dll-search-prefix=cyg -Wl,--allow-multiple-definition \
- -Wl,--allow-shlib-undefined -Wl,--export-dynamic \
+ -Wl,--allow-shlib-undefined \
-Wl,--out-implib=libchicken.dll.a -Wl,--export-all-symbols \
-Wl,--enable-auto-import \
-Wl,--whole-archive $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT) \
Trap