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

bc: repair --enable-shared install

Browse Source 
Don't try to install librktio.a when building in shared-library mode.
This commit is contained in:
Matthew Flatt 2020-06-30 07:37:16 -06:00
parent d008d60e23
commit c0a525db60
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
racket/src/cfg-racket
View File

@ -656,6 +656,7 @@ USE_WXPRECOMP
WXPRECOMP
MAKE_FINISH
MRLIBINSTALL
ICP_STATIC_LIB
ICP_LIB
ICP
WXVARIANT
@ -7011,6 +7012,7 @@ if test "${enable_shared}" = "yes" ; then
WXLIBS=WXLIBSDYN
ICP="${LIBTOOLPROG} --mode=install cp"
ICP_LIB="${LIBTOOLPROG} --mode=install install -s"
ICP_STATIC_LIB='$(NOOP)'
MRLIBINSTALL="install-lib"
LIBFINISH="${LIBTOOLPROG} --mode=finish"
LTO="lo"
@ -7024,6 +7026,7 @@ else
WXLIBS=WXLIBSNORM
ICP=cp
ICP_LIB=cp
ICP_STATIC_LIB=cp
MRLIBINSTALL="install-no-lib"
LIBFINISH=echo
LTO="o"
@ -7144,6 +7147,7 @@ LIBS="$LIBS $EXTRALIBS"
mk_needed_dir()

5
racket/src/racket/Makefile.in
View File

@ -375,6 +375,7 @@ clean@OSX@:
BUILDINFO=$(DESTDIR)$(libpltdir)/buildinfo
ICP=@ICP@
ICP_LIB=@ICP_LIB@
ICP_STATIC_LIB=@ICP_STATIC_LIB@
install:
$(MAKE) install-@MAIN_VARIANT@
@ -428,7 +429,7 @@ unix-install-cgc:
unix-install-libs-cgc:
cd ..; $(ICP_LIB) racket/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@"
cd ..; $(ICP_LIB) racket/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@"
cd ..; $(ICP_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@"
cd ..; $(ICP_STATIC_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@"
cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@"
cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libracket.@LIBSFX@"
@ -447,7 +448,7 @@ unix-install-3m:
unix-install-libs-3m:
cd ..; $(ICP_LIB) racket/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@"
cd ..; $(ICP_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@"
cd ..; $(ICP_STATIC_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@"
cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@"
unix-no-install-libs-3m:

3
racket/src/racket/configure.ac
View File

@ -1409,6 +1409,7 @@ if test "${enable_shared}" = "yes" ; then
WXLIBS=WXLIBSDYN
ICP="${LIBTOOLPROG} --mode=install cp"
ICP_LIB="${LIBTOOLPROG} --mode=install install -s"
ICP_STATIC_LIB='$(NOOP)'
MRLIBINSTALL="install-lib"
LIBFINISH="${LIBTOOLPROG} --mode=finish"
LTO="lo"
@ -1422,6 +1423,7 @@ else
WXLIBS=WXLIBSNORM
ICP=cp
ICP_LIB=cp
ICP_STATIC_LIB=cp
MRLIBINSTALL="install-no-lib"
LIBFINISH=echo
LTO="o"
@ -1499,6 +1501,7 @@ AC_SUBST(WXLIBS)
AC_SUBST(WXVARIANT)
AC_SUBST(ICP)
AC_SUBST(ICP_LIB)
AC_SUBST(ICP_STATIC_LIB)
AC_SUBST(MRLIBINSTALL)
AC_SUBST(MAKE_FINISH)