diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix CYGWIN compilation

Browse Source
This commit is contained in:
U-WIN-U2045GN0RNQ\Vítor Santos Costa 2010-08-03 01:11:13 +01:00
parent fd64559643
commit 8340ee4cb1
3 changed files with 1961 additions and 1957 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/load_dl.c Normal file → Executable file
View File

@ -46,8 +46,10 @@ Yap_LoadForeignFile(char *file, int flags)
dlflag = RTLD_LAZY; dlflag = RTLD_LAZY;
if (flags & GLOBAL_LOADING) if (flags & GLOBAL_LOADING)
dlflag |= RTLD_GLOBAL; dlflag |= RTLD_GLOBAL;
#ifndef __CYGWIN__
else else
dlflag |= RTLD_LOCAL; dlflag |= RTLD_LOCAL;
#endif
out = (void *)dlopen(file,dlflag); out = (void *)dlopen(file,dlflag);
if (!out) { if (!out) {

3
configure vendored
View File

@ -5100,6 +5100,7 @@ _ACEOF
fi fi
EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll"
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwsock32" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwsock32" >&5
$as_echo_n "checking for main in -lwsock32... " >&6; } $as_echo_n "checking for main in -lwsock32... " >&6; }
@ -7112,7 +7113,7 @@ fi
INSTALL_DLLS="" INSTALL_DLLS=""
DO_SECOND_LD="" DO_SECOND_LD=""
MERGE_DLL_OBJS="" MERGE_DLL_OBJS=""
IN_UNIX="#" IN_UNIX="#"
YAPLIB_LD="\$(CC) -shared -Wl,--export-all-symbols" YAPLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
PRE_INSTALL_ENV="" PRE_INSTALL_ENV=""
INSTALL_ENV="" INSTALL_ENV=""

3
configure.in
View File

@ -553,6 +553,7 @@ then
CC="${CC} -mno-cygwin" CC="${CC} -mno-cygwin"
CXX="${CXX} -mno-cygwin" CXX="${CXX} -mno-cygwin"
AC_CHECK_LIB(wsock32,main) AC_CHECK_LIB(wsock32,main)
EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll"
else else
AC_CHECK_LIB(wsock32,main) AC_CHECK_LIB(wsock32,main)
EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll" EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll"
@ -1101,7 +1102,7 @@ dnl Linux has both elf and a.out, in this case we found elf
INSTALL_DLLS="" INSTALL_DLLS=""
DO_SECOND_LD="" DO_SECOND_LD=""
MERGE_DLL_OBJS="" MERGE_DLL_OBJS=""
IN_UNIX="#" IN_UNIX="#"
YAPLIB_LD="\$(CC) -shared -Wl,--export-all-symbols" YAPLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
PRE_INSTALL_ENV="" PRE_INSTALL_ENV=""
INSTALL_ENV="" INSTALL_ENV=""