From 8e162082e1852d65c3102a29cc99ad1066f7d8ad Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 8 Jan 2016 16:40:58 -0700 Subject: [PATCH] fix foreign library references for cross-build --- racket/collects/db/private/sqlite3/ffi.rkt | 8 +++++--- racket/collects/openssl/libcrypto.rkt | 6 ++++-- racket/collects/openssl/libssl.rkt | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/racket/collects/db/private/sqlite3/ffi.rkt b/racket/collects/db/private/sqlite3/ffi.rkt index 2dde57c10e..d1c4692a0c 100644 --- a/racket/collects/db/private/sqlite3/ffi.rkt +++ b/racket/collects/db/private/sqlite3/ffi.rkt @@ -1,15 +1,17 @@ #lang racket/base -(require (for-syntax racket/base) +(require (for-syntax racket/base + setup/cross-system) racket/runtime-path ffi/unsafe - ffi/unsafe/define) + ffi/unsafe/define + setup/cross-system) (require "ffi-constants.rkt") (provide (all-from-out "ffi-constants.rkt") (protect-out (all-defined-out))) ;; raco distribute should include Racket's sqlite3 if present (define-runtime-path sqlite-so - (case (system-type) + (case (cross-system-type) [(windows) '(so "sqlite3")] [else '(so "libsqlite3" ("0" #f))])) diff --git a/racket/collects/openssl/libcrypto.rkt b/racket/collects/openssl/libcrypto.rkt index 772e9b5d1a..64e3df7e18 100644 --- a/racket/collects/openssl/libcrypto.rkt +++ b/racket/collects/openssl/libcrypto.rkt @@ -1,7 +1,9 @@ #lang racket/base (require ffi/unsafe racket/runtime-path - (for-syntax racket/base)) + setup/cross-system + (for-syntax racket/base + setup/cross-system)) (provide libcrypto libcrypto-load-fail-reason @@ -42,7 +44,7 @@ ;; We need to declare because they might be distributed with Racket, ;; in which case they should get bundled with stand-alone executables: (define-runtime-path libcrypto-so - (case (system-type) + (case (cross-system-type) [(windows) '(so "libeay32")] [(macosx) ;; Version "1.0.0" is bundled with Racket diff --git a/racket/collects/openssl/libssl.rkt b/racket/collects/openssl/libssl.rkt index 214b4fe28a..f4c4ac1682 100644 --- a/racket/collects/openssl/libssl.rkt +++ b/racket/collects/openssl/libssl.rkt @@ -1,7 +1,9 @@ #lang racket/base (require ffi/unsafe racket/runtime-path - (for-syntax racket/base) + setup/cross-system + (for-syntax racket/base + setup/cross-system) "libcrypto.rkt") (provide libssl @@ -12,7 +14,7 @@ ;; We need to declare because they might be distributed with PLT Scheme ;; in which case they should get bundled with stand-alone executables: (define-runtime-path libssl-so - (case (system-type) + (case (cross-system-type) [(windows) '(so "ssleay32")] [(macosx) ;; Version "1.0.0" is bundled with Racket