suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cs: restore -natipkg in system-library-subpath result

Browse Source
This commit is contained in:
Matthew Flatt 2020-11-22 11:37:00 -07:00
parent 380550a858
commit 4b39dc73be
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
racket/src/cs/c/Makefile.in
View File

@ -477,8 +477,10 @@ common-install:
$(MAKE) include-install $(MAKE) include-install
$(MAKE) common-@INSTALL_LIBS_ENABLE@-libs $(MAKE) common-@INSTALL_LIBS_ENABLE@-libs
SYSTEM_RKTD = $(DESTDIR)$(libpltdir)/system$(CS_INSTALLED).rktd
system-install: system-install:
$(RACKET) -cu "$(srcdir)/gen-system.rkt" $(DESTDIR)$(libpltdir)/system$(CS_INSTALLED).rktd $(TARGET_MACH) @CROSS_COMPILE_TARGET_KIND@ "$(srcdir)" $(RACKET) -cu "$(srcdir)/gen-system.rkt" $(SYSTEM_RKTD) $(TARGET_MACH) @CROSS_COMPILE_TARGET_KIND@ "$(srcdir)" "@PLT_CS_SLSP_SUFFIX@"
include-install: include-install:
$(ICP) $(srcdir)/api.h "$(DESTDIR)$(includepltdir)/racketcs.h" $(ICP) $(srcdir)/api.h "$(DESTDIR)$(includepltdir)/racketcs.h"

7
racket/src/cs/c/configure vendored
View File

@ -622,6 +622,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
LIBOBJS LIBOBJS
PLT_CS_SLSP_SUFFIX
INSTALL_LIBS_ENABLE INSTALL_LIBS_ENABLE
INSTALL_SETUP_RACKET_FLAGS INSTALL_SETUP_RACKET_FLAGS
INSTALL_SETUP_FLAGS INSTALL_SETUP_FLAGS
@ -3198,6 +3199,8 @@ LZ4_LIB_DEP='$(OWN_LZ4_LIB)'
LZ4_LIB='$(OWN_LZ4_LIB)' LZ4_LIB='$(OWN_LZ4_LIB)'
LZ4_LIB_UNPACK='$(AR) x $(OWN_LZ4_LIB)' LZ4_LIB_UNPACK='$(AR) x $(OWN_LZ4_LIB)'
PLT_CS_SLSP_SUFFIX=
enable_pthread_by_default=yes enable_pthread_by_default=yes
cs_auto_flags=--disable-auto-flags cs_auto_flags=--disable-auto-flags
@ -4756,6 +4759,7 @@ fi
if test "${enable_natipkg}" = "yes" ; then if test "${enable_natipkg}" = "yes" ; then
CONFIGURE_RACKET_SO_COMPILE="${CONFIGURE_RACKET_SO_COMPILE} env PLT_CS_SLSP_SUFFIX=-natipkg" CONFIGURE_RACKET_SO_COMPILE="${CONFIGURE_RACKET_SO_COMPILE} env PLT_CS_SLSP_SUFFIX=-natipkg"
PLT_CS_SLSP_SUFFIX="-natipkg"
fi fi
############## ubsan ################ ############## ubsan ################
@ -5536,6 +5540,8 @@ if test "${enable_shared}" = "yes" ; then
STRIP_LIB_DEBUG=":" STRIP_LIB_DEBUG=":"
LIBSFX=la LIBSFX=la
ICP_LIB="${LIBTOOLPROG} --mode=install install -s" ICP_LIB="${LIBTOOLPROG} --mode=install install -s"
CONFIGURE_RACKET_SO_COMPILE="env PLT_CS_MAKE_LINK_SHARED=y"
else else
ICP=cp ICP=cp
LTO="o" LTO="o"
@ -5637,6 +5643,7 @@ SCHEME_CROSS_CONFIG_ARGS="--machine=${TARGET_MACH} --disable-x11 ${cs_auto_flags
makefiles="Makefile" makefiles="Makefile"

4
racket/src/cs/c/configure.ac
View File

@ -157,6 +157,8 @@ LZ4_LIB_DEP='$(OWN_LZ4_LIB)'
LZ4_LIB='$(OWN_LZ4_LIB)' LZ4_LIB='$(OWN_LZ4_LIB)'
LZ4_LIB_UNPACK='$(AR) x $(OWN_LZ4_LIB)' LZ4_LIB_UNPACK='$(AR) x $(OWN_LZ4_LIB)'
PLT_CS_SLSP_SUFFIX=
enable_pthread_by_default=yes enable_pthread_by_default=yes
cs_auto_flags=--disable-auto-flags cs_auto_flags=--disable-auto-flags
@ -483,6 +485,7 @@ m4_include(../ac/strip.m4)
if test "${enable_natipkg}" = "yes" ; then if test "${enable_natipkg}" = "yes" ; then
CONFIGURE_RACKET_SO_COMPILE="${CONFIGURE_RACKET_SO_COMPILE} env PLT_CS_SLSP_SUFFIX=-natipkg" CONFIGURE_RACKET_SO_COMPILE="${CONFIGURE_RACKET_SO_COMPILE} env PLT_CS_SLSP_SUFFIX=-natipkg"
PLT_CS_SLSP_SUFFIX="-natipkg"
fi fi
############## ubsan ################ ############## ubsan ################
@ -765,6 +768,7 @@ AC_SUBST(RUN_RACKET)
AC_SUBST(INSTALL_SETUP_FLAGS) AC_SUBST(INSTALL_SETUP_FLAGS)
AC_SUBST(INSTALL_SETUP_RACKET_FLAGS) AC_SUBST(INSTALL_SETUP_RACKET_FLAGS)
AC_SUBST(INSTALL_LIBS_ENABLE) AC_SUBST(INSTALL_LIBS_ENABLE)
AC_SUBST(PLT_CS_SLSP_SUFFIX)
makefiles="Makefile" makefiles="Makefile"

7
racket/src/cs/c/gen-system.rkt
View File

@ -1,9 +1,10 @@
(module gen-system '#%kernel (module gen-system '#%kernel
;; Command-line argument: <dest-file> <target-machine> <cross-target-machine> <srcdir> ;; Command-line argument: <dest-file> <target-machine> <cross-target-machine> <srcdir> <slsp-suffix>
(define-values (machine) (string->symbol (vector-ref (current-command-line-arguments) 1))) (define-values (machine) (string->symbol (vector-ref (current-command-line-arguments) 1)))
(define-values (srcdir) (vector-ref (current-command-line-arguments) 3)) (define-values (srcdir) (vector-ref (current-command-line-arguments) 3))
(define-values (slsp-suffix) (vector-ref (current-command-line-arguments) 4))
(define-values (definitions) (define-values (definitions)
(call-with-input-file (call-with-input-file
@ -93,6 +94,7 @@
(define-values (so-suffix) (lookup 'so-suffix-bytes)) (define-values (so-suffix) (lookup 'so-suffix-bytes))
(define-values (lib-subpath) (define-values (lib-subpath)
(string-append
(if (eq? machine 'ta6nt) (if (eq? machine 'ta6nt)
"win32\\x86_64" "win32\\x86_64"
(if (eq? machine 'a6nt) (if (eq? machine 'a6nt)
@ -101,7 +103,8 @@
"win32\\i386" "win32\\i386"
(if (eq? machine 'ti3nt) (if (eq? machine 'ti3nt)
"win32\\i386" "win32\\i386"
(format "~a-~a" arch os*)))))) (format "~a-~a" arch os*)))))
slsp-suffix))
(define-values (ht) (define-values (ht)
(hash 'os os (hash 'os os