From 2bd3cc876cc90b8e28e0e8d88a5982f69729f867 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Thu, 29 Dec 2016 02:13:58 -0800 Subject: Add Boot support for native load unit specification in foreign function import. --- config/open-axiom.m4 | 7 ++++++- config/var-def.mk | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index 54a90d48..dc64510b 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -632,7 +632,7 @@ AC_DEFINE_UNQUOTED([OPENAXIOM_HOST_LISP_PRECISION], dnl -------------------------------------- dnl -- OPENAXIOM_DYNAMIC_MODULE_SUPPORT -- dnl -------------------------------------- -dnl Infer compiler flags and file extensions associated +dnl Infer compiler flags, file prefix and extensions associated dnl with dynamic module support. dnl We need to link some C object files into in the Lisp images we dnl use. Some Lisps (e.g. GCL, ECL) support inclusion of ``ordinary'' @@ -646,6 +646,7 @@ AC_DEFUN([OPENAXIOM_DYNAMIC_MODULE_SUPPORT],[ AC_SUBST(oa_use_libtool_for_shared_lib) AC_SUBST(oa_shrobj_flags) AC_SUBST(oa_shrlib_flags) +AC_SUBST(oa_shrlib_prefix) oa_use_libtool_for_shared_lib=no oa_shrobj_flags= oa_shrlib_flags= @@ -654,6 +655,8 @@ oa_shrlib_flags= LT_PREREQ([2.2.6]) LT_INIT([pic-only dlopen win32-dll shared]) AC_SUBST([LIBTOOL_DEPS]) +# Most targets use 'lib' prefix, as in 'libOpenAxiom'. +oa_shrlib_prefix='lib' # Give me extension of libraries AC_SUBST(shared_ext) AC_SUBST(libext) @@ -663,6 +666,8 @@ case $host in *mingw*|*cygwin*) oa_shrobj_flags='-prefer-pic' oa_shrlib_flags="-shared -Wl,--export-all-symbols" + # Windows platforms don't need a prefix + oa_shrlib_prefix= ;; *darwin*) oa_shrobj_flags='-dynamic' diff --git a/config/var-def.mk b/config/var-def.mk index 805c157b..7f567f58 100644 --- a/config/var-def.mk +++ b/config/var-def.mk @@ -61,6 +61,7 @@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ OBJEXT = @OBJEXT@ EXEEXT = @EXEEXT@ +oa_shrlib_prefix = @oa_shrlib_prefix@ # this includes leading period SHREXT = @shared_ext@ # extension of the archive library; this does not include period -- cgit v1.2.3