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

more CXX stuff: will it ever end?

This commit is contained in:
Vitor Santos Costa 2009-12-10 23:47:34 +00:00
parent ac2cf2434a
commit 933f96a80d
3 changed files with 11061 additions and 2341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13391
configure vendored
View File

File diff suppressed because it is too large Load Diff

9
configure.in
View File

@ -768,6 +768,7 @@ INSTALL_DLLS="#"
EXTRA_OBJS="" EXTRA_OBJS=""
SHLIB_LD="#" SHLIB_LD="#"
SHLIB_LOWER_LD="#" SHLIB_LOWER_LD="#"
SHLIB_LOWER_CXX_LD="#"
SHLIB_SWI_LD="#" SHLIB_SWI_LD="#"
DO_SECOND_LD="#" DO_SECOND_LD="#"
M4="m4" M4="m4"
@ -790,6 +791,7 @@ case "$target_os" in
SHLIB_SUFFIX=".so" SHLIB_SUFFIX=".so"
SHLIB_LD="$CC -shared -export-dynamic" SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_LOWER_LD="$SHLIB_LD" SHLIB_LOWER_LD="$SHLIB_LD"
SHLIB_LOWER_CXX_LD="$CXX -shared -export-dynamic $SHLIB_LD"
SHLIB_SWI_LD="$CC -shared -export-dynamic" SHLIB_SWI_LD="$CC -shared -export-dynamic"
DO_SECOND_LD="" DO_SECOND_LD=""
LIBS="$LIBS -ldl" LIBS="$LIBS -ldl"
@ -849,6 +851,7 @@ case "$target_os" in
#otherwise no external predicates. #otherwise no external predicates.
SHLIB_LD="$CC -shared -export-dynamic" SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_LOWER_LD="$SHLIB_LD" SHLIB_LOWER_LD="$SHLIB_LD"
SHLIB_LOWER_CXX_LD="$CXX -shared -export-dynamic"
SHLIB_SWI_LD="$CC -shared -export-dynamic" SHLIB_SWI_LD="$CC -shared -export-dynamic"
DO_SECOND_LD="" DO_SECOND_LD=""
SHLIB_SUFFIX=".sl" SHLIB_SUFFIX=".sl"
@ -898,6 +901,7 @@ dnl Linux has both elf and a.out, in this case we found elf
DO_SECOND_LD="" DO_SECOND_LD=""
SHLIB_LD="ld -n32 -shared -rdata_shared" SHLIB_LD="ld -n32 -shared -rdata_shared"
SHLIB_LOWER_LD="$SHLIB_LD" SHLIB_LOWER_LD="$SHLIB_LD"
SHLIB_LOWER_CXX_LD="$SHLIB_LD"
SHLIB_SWI_LD="ld -n32 -shared -rdata_shared" SHLIB_SWI_LD="ld -n32 -shared -rdata_shared"
INSTALL_DLLS="" INSTALL_DLLS=""
;; ;;
@ -921,6 +925,7 @@ dnl Linux has both elf and a.out, in this case we found elf
# LDFLAGS="-Wl,-x -dead_strip -dead_strip_dylibs $LDFLAGS" # LDFLAGS="-Wl,-x -dead_strip -dead_strip_dylibs $LDFLAGS"
SHLIB_LD="$CC -bundle -flat_namespace -undefined suppress" SHLIB_LD="$CC -bundle -flat_namespace -undefined suppress"
SHLIB_LOWER_LD="$SHLIB_LD" SHLIB_LOWER_LD="$SHLIB_LD"
SHLIB_LOWER_CXX_LD="$CXX -bundle -flat_namespace -undefined suppress"
SHLIB_SWI_LD="$CC -bundle -flat_namespace -undefined suppress" SHLIB_SWI_LD="$CC -bundle -flat_namespace -undefined suppress"
INSTALL_DLLS="" INSTALL_DLLS=""
CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2" CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2"
@ -939,6 +944,7 @@ dnl Linux has both elf and a.out, in this case we found elf
SHLIB_CFLAGS="-fPIC" SHLIB_CFLAGS="-fPIC"
SHLIB_LD="ld -Bshareable -x" SHLIB_LD="ld -Bshareable -x"
SHLIB_LOWER_LD="$SHLIB_LD" SHLIB_LOWER_LD="$SHLIB_LD"
SHLIB_LOWER_CXX_LD="$SHLIB_LOWER_LD"
SHLIB_SWI_LD="ld -Bshareable -x" SHLIB_SWI_LD="ld -Bshareable -x"
DO_SECOND_LD="" DO_SECOND_LD=""
SHLIB_SUFFIX=".so" SHLIB_SUFFIX=".so"
@ -951,6 +957,7 @@ dnl Linux has both elf and a.out, in this case we found elf
SHLIB_CFLAGS="-fPIC" SHLIB_CFLAGS="-fPIC"
SHLIB_LD="$CC -shared" SHLIB_LD="$CC -shared"
SHLIB_LOWER_LD="$SHLIB_LD" SHLIB_LOWER_LD="$SHLIB_LD"
SHLIB_LOWER_CXX_LD="$CXX -shared"
SHLIB_SWI_LD="$CC -shared" SHLIB_SWI_LD="$CC -shared"
DO_SECOND_LD="" DO_SECOND_LD=""
SHLIB_SUFFIX=".so" SHLIB_SUFFIX=".so"
@ -963,6 +970,7 @@ dnl Linux has both elf and a.out, in this case we found elf
SHLIB_CFLAGS="" SHLIB_CFLAGS=""
SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll" SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll"
SHLIB_LOWER_LD="\$(CC) -shared -Wl,--export-all-symbols ../../../yap.dll" SHLIB_LOWER_LD="\$(CC) -shared -Wl,--export-all-symbols ../../../yap.dll"
SHLIB_LOWER_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols ../../../yap.dll"
SHLIB_SWI_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll ../../packages/PLStream/plstream.dll" SHLIB_SWI_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll ../../packages/PLStream/plstream.dll"
SHLIB_SUFFIX=".dll" SHLIB_SUFFIX=".dll"
C_PARSER_FLAGS="$C_INTERF_FLAGS" C_PARSER_FLAGS="$C_INTERF_FLAGS"
@ -1283,6 +1291,7 @@ dnl how to call the loader
AC_SUBST(DO_SECOND_LD) AC_SUBST(DO_SECOND_LD)
AC_SUBST(SHLIB_LD) AC_SUBST(SHLIB_LD)
AC_SUBST(SHLIB_LOWER_LD) AC_SUBST(SHLIB_LOWER_LD)
AC_SUBST(SHLIB_LOWER_CXX_LD)
AC_SUBST(SHLIB_SWI_LD) AC_SUBST(SHLIB_SWI_LD)
AC_SUBST(DYNLIB_LD) AC_SUBST(DYNLIB_LD)
dnl objects in YAP library dnl objects in YAP library

2
packages/swi-minisat2/C/Makefile.in
View File

@ -68,7 +68,7 @@ pl-minisat.o : $(srcdir)/pl-minisat.C
$(CXX) -c $(CXXFLAGS) $(SHLIB_CFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o $(CXX) -c $(CXXFLAGS) $(SHLIB_CFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o
@DO_SECOND_LD@pl-minisat@SHLIB_SUFFIX@: $(OBJS) @DO_SECOND_LD@pl-minisat@SHLIB_SUFFIX@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LOWER_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS) @DO_SECOND_LD@ @SHLIB_LOWER_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS)
install: all install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)