OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.in: Set gcc_version here.

Browse Source 
* Makefile.in: Set gcc_version here.
	* configure.ac: Do not invoke TL_AC_GCC_VERSION.  Adjust quoting
	in definition of toolexeclibdir so that $(gcc_version) is expanded
	by the Makefile.
	* aclocal.m4, configure: Regenerate.

From-SVN: r96816
This commit is contained in:
Zack Weinberg 2005-03-21 17:42:26 +00:00
parent 47194af45f
commit 2b37e3d54d
5 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libobjc/ChangeLog
View File

@ -1,3 +1,11 @@
2005-03-21 Zack Weinberg <zack@codesourcery.com>
* Makefile.in: Set gcc_version here.
* configure.ac: Do not invoke TL_AC_GCC_VERSION. Adjust quoting
in definition of toolexeclibdir so that $(gcc_version) is expanded
by the Makefile.
* aclocal.m4, configure: Regenerate.
2005-03-03 David Ayers <d.ayers@inode.at> 2005-03-03 David Ayers <d.ayers@inode.at>
* objc/hash.h (OBJC_IGNORE_DEPRECATED_API): Update deprecated * objc/hash.h (OBJC_IGNORE_DEPRECATED_API): Update deprecated
@ -80,7 +88,7 @@
* aclocal.m4, config.h.in: Regenerate. * aclocal.m4, config.h.in: Regenerate.
2004-10-08 Mike Stump <mrs@apple.com> 2004-10-08 Mike Stump <mrs@apple.com>
Andrew Pinski <pinskia@physics.uc.edu> Andrew Pinski <pinskia@physics.uc.edu>
* aclocal.m4: Rename to ... * aclocal.m4: Rename to ...
* acinclude.m4: here and also use m4_include instead of sinclude. * acinclude.m4: here and also use m4_include instead of sinclude.
@ -148,7 +156,7 @@
zero-sized array. zero-sized array.
(objc_method): Hoist definition to file scope. (objc_method): Hoist definition to file scope.
(_objc_load_callback, _objc_object_alloc, class_get_class_method, (_objc_load_callback, _objc_object_alloc, class_get_class_method,
class_get_instance_method, class_create_instance, class_get_instance_method, class_create_instance,
class_get_class_name, class_get_instance_size, class_get_class_name, class_get_instance_size,
class_get_meta_class, class_get_super_class, class_get_version, class_get_meta_class, class_get_super_class, class_get_version,
class_is_class, class_is_meta_class, class_set_version, class_is_class, class_is_meta_class, class_set_version,

2
libobjc/Makefile.in
View File

@ -33,7 +33,7 @@ VPATH = @glibcpp_srcdir@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
target_noncanonical = @target_noncanonical@ target_noncanonical = @target_noncanonical@
gcc_version = @gcc_version@ gcc_version := $(shell cat $(srcdir)/../gcc/BASE-VER)
host_subdir = @host_subdir@ host_subdir = @host_subdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
toplevel_srcdir = @toplevel_srcdir@ toplevel_srcdir = @toplevel_srcdir@

1
libobjc/aclocal.m4 vendored
View File

@ -198,5 +198,4 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
fi fi
]) ])
m4_include([../config/gcc-version.m4])
m4_include([acinclude.m4]) m4_include([acinclude.m4])

28
libobjc/configure vendored
View File

@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
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 build build_cpu build_vendor build_os build_subdir host_subdir target_subdir VERSION OBJC_BOEHM_GC toplevel_srcdir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version_trigger gcc_version_full gcc_version toolexecdir toolexeclibdir includedirname libext CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP 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 build build_cpu build_vendor build_os build_subdir host_subdir target_subdir VERSION OBJC_BOEHM_GC toplevel_srcdir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir toolexecdir toolexeclibdir includedirname libext CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -1588,23 +1588,6 @@ case $srcdir in
esac esac
if test "${with_gcc_version_trigger+set}" = set; then
gcc_version_trigger=$with_gcc_version_trigger
else
gcc_version_trigger=$srcdir/../gcc/version.c
fi
if test -f "${gcc_version_trigger}"; then
gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
else
gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
fi
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
# Calculate toolexeclibdir # Calculate toolexeclibdir
# Also toolexecdir, though it's only used in toolexeclibdir # Also toolexecdir, though it's only used in toolexeclibdir
case ${version_specific_libs} in case ${version_specific_libs} in
@ -1613,7 +1596,7 @@ case ${version_specific_libs} in
# and header files if --enable-version-specific-runtime-libs option # and header files if --enable-version-specific-runtime-libs option
# is selected. # is selected.
toolexecdir='$(libdir)/gcc/$(target_noncanonical)' toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
;; ;;
no) no)
if test -n "$with_cross_host" && if test -n "$with_cross_host" &&
@ -3712,7 +3695,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 3715 "configure"' > conftest.$ac_ext echo '#line 3698 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
@ -5140,7 +5123,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
: :
else else
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 5143 "configure" #line 5126 "configure"
@interface Frob @interface Frob
@end @end
@implementation Frob @implementation Frob
@ -5864,9 +5847,6 @@ s,@target_vendor@,$target_vendor,;t t
s,@target_os@,$target_os,;t t s,@target_os@,$target_os,;t t
s,@target_noncanonical@,$target_noncanonical,;t t s,@target_noncanonical@,$target_noncanonical,;t t
s,@glibcpp_srcdir@,$glibcpp_srcdir,;t t s,@glibcpp_srcdir@,$glibcpp_srcdir,;t t
s,@gcc_version_trigger@,$gcc_version_trigger,;t t
s,@gcc_version_full@,$gcc_version_full,;t t
s,@gcc_version@,$gcc_version,;t t
s,@toolexecdir@,$toolexecdir,;t t s,@toolexecdir@,$toolexecdir,;t t
s,@toolexeclibdir@,$toolexeclibdir,;t t s,@toolexeclibdir@,$toolexeclibdir,;t t
s,@includedirname@,$includedirname,;t t s,@includedirname@,$includedirname,;t t

4
libobjc/configure.ac
View File

@ -118,8 +118,6 @@ case $srcdir in
esac esac
AC_SUBST(glibcpp_srcdir) AC_SUBST(glibcpp_srcdir)
TL_AC_GCC_VERSION([$srcdir/..])
# Calculate toolexeclibdir # Calculate toolexeclibdir
# Also toolexecdir, though it's only used in toolexeclibdir # Also toolexecdir, though it's only used in toolexeclibdir
case ${version_specific_libs} in case ${version_specific_libs} in
@ -128,7 +126,7 @@ case ${version_specific_libs} in
# and header files if --enable-version-specific-runtime-libs option # and header files if --enable-version-specific-runtime-libs option
# is selected. # is selected.
toolexecdir='$(libdir)/gcc/$(target_noncanonical)' toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
;; ;;
no) no)
if test -n "$with_cross_host" && if test -n "$with_cross_host" &&