configure fix for mzdyn.o, especially on AMD64
svn: r530
This commit is contained in:
Matthew Flatt
parent
21a3ded089
commit
222d731ff2
9
src/configure
vendored
9
src/configure
vendored
|
|
@ -314,7 +314,7 @@ ac_subdirs_all="$ac_subdirs_all foreign/gcc/libffi"
|
|||
ac_subdirs_all="$ac_subdirs_all llvm/llvm"
|
||||
ac_subdirs_all="$ac_subdirs_all wxcommon/jpeg"
|
||||
ac_subdirs_all="$ac_subdirs_all wxxt/src/x/wbuild"
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP RANLIB ac_ct_RANLIB PERL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PREFLAGS COMPFLAGS PROFFLAGS SED AS AR STATIC_AR ARFLAGS WBUILD CC_FOR_BUILD REZ MZLINKER PLAIN_CC x_includes x_libraries OPTIONS MZOPTIONS CGCOPTIONS GC2OPTIONS MROPTIONS GCDIR MZBINTARGET MZINSTALLTARGET EXTRA_GMP_OBJ OSX NOT_OSX FRAMEWORK_INSTALL_DIR MREDLINKER LIBSFX WXLIBS WXVARIANT ICP MRLIBINSTALL LIBFINISH MAKE_MRED MAKE_MRED3M MAKE_MREDINSTALL MAKE_MREDINSTALL3M MAKE_WBUILD MAKE_COPYTREE MAKE_FINISH WXPRECOMP USE_WXPRECOMP INCLUDEDEP WX_MMD_FLAG JPEG_A JPEG_INC ZLIB_A ZLIB_INC PNG_A OSKHOME EXTRA_OSK_LIBS FOREIGN_OBJSLIB_IF_USED FOREIGN_LIB_IF_USED FOREIGN_OBJSLIB FOREIGN_CONVENIENCE FOREIGNTARGET LIBMZSCHEME_DEP LIBMRED_DEP LLVMTARGET LTO LTA subdirs LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP RANLIB ac_ct_RANLIB PERL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PREFLAGS COMPFLAGS PROFFLAGS SED AS AR STATIC_AR ARFLAGS WBUILD CC_FOR_BUILD REZ MZLINKER PLAIN_CC DYN_CFLAGS x_includes x_libraries OPTIONS MZOPTIONS CGCOPTIONS GC2OPTIONS MROPTIONS GCDIR MZBINTARGET MZINSTALLTARGET EXTRA_GMP_OBJ OSX NOT_OSX FRAMEWORK_INSTALL_DIR MREDLINKER LIBSFX WXLIBS WXVARIANT ICP MRLIBINSTALL LIBFINISH MAKE_MRED MAKE_MRED3M MAKE_MREDINSTALL MAKE_MREDINSTALL3M MAKE_WBUILD MAKE_COPYTREE MAKE_FINISH WXPRECOMP USE_WXPRECOMP INCLUDEDEP WX_MMD_FLAG JPEG_A JPEG_INC ZLIB_A ZLIB_INC PNG_A OSKHOME EXTRA_OSK_LIBS FOREIGN_OBJSLIB_IF_USED FOREIGN_LIB_IF_USED FOREIGN_OBJSLIB FOREIGN_CONVENIENCE FOREIGNTARGET LIBMZSCHEME_DEP LIBMRED_DEP LLVMTARGET LTO LTA subdirs LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -5108,6 +5108,7 @@ MZINSTALLTARGET=normal-install
|
|||
MZOPTIONS=
|
||||
CGCOPTIONS=
|
||||
GC2OPTIONS=
|
||||
DYN_CFLAGS=
|
||||
|
||||
LIBS=
|
||||
|
||||
|
|
@ -6836,6 +6837,9 @@ if test "$CC" = "gcc" ; then
|
|||
WX_MMD_FLAG="-MMD"
|
||||
INCLUDEDEP="-include"
|
||||
fi
|
||||
|
||||
# Compile mzdyn.o with -fPIC
|
||||
DYN_CFLAGS="-fPIC"
|
||||
fi
|
||||
|
||||
if test "${enable_perl}" = "yes" ; then
|
||||
|
|
@ -8607,6 +8611,7 @@ case $OS in
|
|||
OSX=""
|
||||
NOT_OSX=".other"
|
||||
MZINSTALLTARGET=osx-install
|
||||
DYN_CFLAGS=""
|
||||
enable_xrender=no
|
||||
enable_cairo=no
|
||||
enable_shared=no
|
||||
|
|
@ -10991,6 +10996,7 @@ LIBS="$LIBS $EXTRALIBS"
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
mk_needed_dir()
|
||||
|
|
@ -11811,6 +11817,7 @@ s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
|
|||
s,@REZ@,$REZ,;t t
|
||||
s,@MZLINKER@,$MZLINKER,;t t
|
||||
s,@PLAIN_CC@,$PLAIN_CC,;t t
|
||||
s,@DYN_CFLAGS@,$DYN_CFLAGS,;t t
|
||||
s,@x_includes@,$x_includes,;t t
|
||||
s,@x_libraries@,$x_libraries,;t t
|
||||
s,@OPTIONS@,$OPTIONS,;t t
|
||||
|
|
|
|||
|
|
@ -178,6 +178,7 @@ MZINSTALLTARGET=normal-install
|
|||
MZOPTIONS=
|
||||
CGCOPTIONS=
|
||||
GC2OPTIONS=
|
||||
DYN_CFLAGS=
|
||||
|
||||
LIBS=
|
||||
|
||||
|
|
@ -279,6 +280,9 @@ if test "$CC" = "gcc" ; then
|
|||
WX_MMD_FLAG="-MMD"
|
||||
INCLUDEDEP="-include"
|
||||
fi
|
||||
|
||||
# Compile mzdyn.o with -fPIC
|
||||
DYN_CFLAGS="-fPIC"
|
||||
fi
|
||||
|
||||
if test "${enable_perl}" = "yes" ; then
|
||||
|
|
@ -479,6 +483,7 @@ case $OS in
|
|||
OSX=""
|
||||
NOT_OSX=".other"
|
||||
MZINSTALLTARGET=osx-install
|
||||
DYN_CFLAGS=""
|
||||
enable_xrender=no
|
||||
enable_cairo=no
|
||||
enable_shared=no
|
||||
|
|
@ -995,6 +1000,7 @@ AC_SUBST(CC_FOR_BUILD)
|
|||
AC_SUBST(REZ)
|
||||
AC_SUBST(MZLINKER)
|
||||
AC_SUBST(PLAIN_CC)
|
||||
AC_SUBST(DYN_CFLAGS)
|
||||
|
||||
AC_SUBST(x_includes)
|
||||
AC_SUBST(x_libraries)
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@ HEADERS = $(builddir)/../mzconfig.h \
|
|||
MZDYNDEP = ../mzdyn.o $(srcdir)/../include/ext.exp $(srcdir)/../include/mzscheme.exp
|
||||
|
||||
../mzdyn.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h $(HEADERS)
|
||||
$(PLAIN_CC) $(CFLAGS) -c $(srcdir)/mzdyn.c -o ../mzdyn.o
|
||||
$(PLAIN_CC) @DYN_CFLAGS@ $(CFLAGS) -c $(srcdir)/mzdyn.c -o ../mzdyn.o
|
||||
|
||||
../mzdyn3m.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h $(HEADERS)
|
||||
$(PLAIN_CC) $(CFLAGS) -DMZ_PRECISE_GC -c $(srcdir)/mzdyn.c -o ../mzdyn3m.o
|
||||
$(PLAIN_CC) @DYN_CFLAGS@ $(CFLAGS) -DMZ_PRECISE_GC -c $(srcdir)/mzdyn.c -o ../mzdyn3m.o
|
||||
|
||||
../dynexmpl.so: dynexmpl.o $(MZDYNDEP)
|
||||
$(DYNLINK) ../dynexmpl.so dynexmpl.o
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user