From 2bd3cc876cc90b8e28e0e8d88a5982f69729f867 Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <gdr@axiomatics.org>
Date: Thu, 29 Dec 2016 02:13:58 -0800
Subject: Add Boot support for native load unit specification in foreign
 function import.

---
 src/lisp/Makefile.in  | 3 ++-
 src/lisp/core.lisp.in | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/lisp')

diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in
index 3602fe53..979d0432 100644
--- a/src/lisp/Makefile.in
+++ b/src/lisp/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2014, Gabriel Dos Reis.
+# Copyright (C) 2007-2016, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -156,6 +156,7 @@ edit = sed \
 	-e 's|@host[@]|$(host)|g' \
 	-e 's|@build[@]|$(build)|g' \
 	-e 's|@target[@]|$(target)|g' \
+	-e 's|@oa_shrlib_prefix[@]|$(oa_shrlib_prefix)|g' \
 	-e 's|@SHREXT[@]|$(SHREXT)|g' \
 	-e 's|@LIBEXT[@]|$(LIBEXT)|g' \
 	-e 's|@oa_c_runtime_extra[@]|$(patsubst %,"%",$(oa_c_runtime_extra))|g' \
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index 302a2c78..4fce2768 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -3,7 +3,7 @@
 ;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 ;; All rights reserved.
 ;; 
-;; Copyright (C) 2007-2015, Gabriel Dos Reis.
+;; Copyright (C) 2007-2016, Gabriel Dos Reis.
 ;; All rights reserved.
 ;;
 ;; Redistribution and use in source and binary forms, with or without
@@ -186,6 +186,7 @@
 	   "$delayedFFI"
 	   "$useLLVM"
 	   "$effectiveFaslType"
+	   "$NativeModulePrefix"
 	   "$NativeModuleExt"
 	   "$systemInstallationDirectory"
 	   "$NativeTypeTable"
@@ -469,6 +470,10 @@
   #+:ecl (pathname-type (compile-file-pathname "foo.lisp" :system-p t))
   #-:ecl |$faslType|)
 
+;; Prefix of pathname for file containers of native load units.
+(defconstant |$NativeModulePrefix|
+  "@oa_shrlib_prefix@")
+
 ;; Extension of file containers for native shared libraries.
 (defconstant |$NativeModuleExt|
   (cond (|$useDynamicLink| "@SHREXT@")
-- 
cgit v1.2.3