diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-30 11:27:34 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-30 11:27:34 +0000 |
| commit | c3f1c5280b5c71f89a7260dd6b00bb39129c5663 (patch) | |
| tree | 77bce8587a3e27fb9ed80324d284323d52e91bdb /configure.in | |
| parent | 9a8cc1f4abdeacb4adf1a7b59fe2bd6f4ea0ad70 (diff) | |
* configure.in: keep ARCH_FLAG separate. export ARCH_FLAG.
[ruby-core:01819]
* Makefile.in: add ARCH_FLAG to CFLAGS.
* Makefile.in: add @CPPFLAGS@ to CPPFLAGS.
* lib/mkmf.rb (link_command, cc_command): use ARCH_FLAG.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/configure.in b/configure.in index c5b3983ecb..108cea9543 100644 --- a/configure.in +++ b/configure.in @@ -86,7 +86,7 @@ AC_ARG_ENABLE(fat-binary, is disabled or omitted entirely, then the package will be built only for the target platform], [fat_binary=$enableval], [fat_binary=no]) - if test "$fat_binary" != no; then +if test "$fat_binary" != no; then AC_MSG_CHECKING([target architectures]) @@ -125,7 +125,7 @@ AC_ARG_ENABLE(fat-binary, ARCH_FLAG="$ARCH_FLAG -arch $archs" done AC_DEFINE(NEXT_FAT_BINARY) -fi +fi case $target_cpu in i?86) frame_address=yes;; @@ -793,6 +793,7 @@ esac LIBEXT=a AC_SUBST(DLDFLAGS)dnl +AC_SUBST(ARCH_FLAG)dnl AC_SUBST(STATIC)dnl AC_SUBST(CCDLFLAGS)dnl @@ -894,19 +895,15 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes ;; nextstep*) : ${LDSHARED='cc -r -nostdlib'} LDFLAGS="$LDFLAGS -u libsys_s" - DLDFLAGS="$DLDFLAGS $ARCH_FLAG" rb_cv_dlopen=yes ;; openstep*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress'} : ${LDFLAGS=""} - DLDFLAGS="$DLDFLAGS $ARCH_FLAG" rb_cv_dlopen=yes ;; rhapsody*) : $LDSHARED='cc -dynamic -bundle -undefined suppress'} : ${LDFLAGS=""} - DLDFLAGS="$DLDFLAGS $ARCH_FLAG" rb_cv_dlopen=yes ;; darwin*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'} : ${LDFLAGS=""} - DLDFLAGS="$DLDFLAGS $ARCH_FLAG" rb_cv_dlopen=yes ;; aix*) : ${LDSHARED='/usr/ccs/bin/ld'} XLDFLAGS="$XLDFLAGS -Wl,-bE:ruby.imp" @@ -1103,9 +1100,9 @@ if test "$prefix" = NONE; then prefix=$ac_default_prefix fi -if test "$fat_binary" != no ; then - CFLAGS="$CFLAGS $ARCH_FLAG" -fi +#if test "$fat_binary" != no ; then +# CFLAGS="$CFLAGS $ARCH_FLAG" +#fi if test x"$cross_compiling" = xyes; then test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake" |