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

fix a build dependency in --enable-shared mode

Browse Source 
Closes PR 13392
This commit is contained in:
Matthew Flatt 2012-12-28 12:22:32 -07:00
parent 0a708b040a
commit 93affa4d5d
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/configure vendored
View File

@ -742,7 +742,6 @@ FOREIGN_OBJSLIB
FOREIGN_CONVENIENCE FOREIGN_CONVENIENCE
FOREIGNTARGET FOREIGNTARGET
LIBRACKET_DEP LIBRACKET_DEP
LIBGRACKET_DEP
LTO LTO
LTA LTA
collectsdir collectsdir
@ -3935,6 +3934,10 @@ if test "$CC_FOR_BUILD" = "" ; then
CC_FOR_BUILD="$CC" CC_FOR_BUILD="$CC"
fi fi
if test "${enable_shared}" = "yes" ; then
LIBRACKET_DEP="${LIBRACKET_DEP} libmzgc.la"
fi
############## platform tests ################ ############## platform tests ################
# for flags we don't want to use in config tests: # for flags we don't want to use in config tests:
@ -4068,8 +4071,7 @@ _ACEOF
MZINSTALLTARGET=unix-cygwin-install MZINSTALLTARGET=unix-cygwin-install
if test "${enable_shared}" = "yes" ; then if test "${enable_shared}" = "yes" ; then
ar_libtool_no_undefined=" -no-undefined" ar_libtool_no_undefined=" -no-undefined"
LIBRACKET_DEP="libmzgc.la -liconv" LIBRACKET_DEP="${LIBRACKET_DEP} -liconv"
LIBGRACKET_DEP="../racket/libmzgc.la ../racket/libgracket.la"
fi fi
EXE_SUFFIX=".exe" EXE_SUFFIX=".exe"
;; ;;
@ -9031,7 +9033,6 @@ LIBS="$LIBS $EXTRALIBS"
mk_needed_dir() mk_needed_dir()
@ -9891,7 +9892,6 @@ FOREIGN_OBJSLIB!$FOREIGN_OBJSLIB$ac_delim
FOREIGN_CONVENIENCE!$FOREIGN_CONVENIENCE$ac_delim FOREIGN_CONVENIENCE!$FOREIGN_CONVENIENCE$ac_delim
FOREIGNTARGET!$FOREIGNTARGET$ac_delim FOREIGNTARGET!$FOREIGNTARGET$ac_delim
LIBRACKET_DEP!$LIBRACKET_DEP$ac_delim LIBRACKET_DEP!$LIBRACKET_DEP$ac_delim
LIBGRACKET_DEP!$LIBGRACKET_DEP$ac_delim
LTO!$LTO$ac_delim LTO!$LTO$ac_delim
LTA!$LTA$ac_delim LTA!$LTA$ac_delim
collectsdir!$collectsdir$ac_delim collectsdir!$collectsdir$ac_delim
@ -9915,7 +9915,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
break break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

8
src/racket/configure.ac
View File

@ -465,6 +465,10 @@ if test "$CC_FOR_BUILD" = "" ; then
CC_FOR_BUILD="$CC" CC_FOR_BUILD="$CC"
fi fi
if test "${enable_shared}" = "yes" ; then
LIBRACKET_DEP="${LIBRACKET_DEP} libmzgc.la"
fi
############## platform tests ################ ############## platform tests ################
# for flags we don't want to use in config tests: # for flags we don't want to use in config tests:
@ -594,8 +598,7 @@ case "$host_os" in
MZINSTALLTARGET=unix-cygwin-install MZINSTALLTARGET=unix-cygwin-install
if test "${enable_shared}" = "yes" ; then if test "${enable_shared}" = "yes" ; then
ar_libtool_no_undefined=" -no-undefined" ar_libtool_no_undefined=" -no-undefined"
LIBRACKET_DEP="libmzgc.la -liconv" LIBRACKET_DEP="${LIBRACKET_DEP} -liconv"
LIBGRACKET_DEP="../racket/libmzgc.la ../racket/libgracket.la"
fi fi
EXE_SUFFIX=".exe" EXE_SUFFIX=".exe"
;; ;;
@ -1360,7 +1363,6 @@ AC_SUBST(FOREIGN_CONVENIENCE)
AC_SUBST(FOREIGNTARGET) AC_SUBST(FOREIGNTARGET)
AC_SUBST(LIBRACKET_DEP) AC_SUBST(LIBRACKET_DEP)
AC_SUBST(LIBGRACKET_DEP)
AC_SUBST(LTO) AC_SUBST(LTO)
AC_SUBST(LTA) AC_SUBST(LTA)