diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 21 | ||||
| -rwxr-xr-x | configure | 34 | ||||
| -rw-r--r-- | configure.in | 5 |
4 files changed, 43 insertions, 24 deletions
@@ -1,3 +1,10 @@ +Wed Jun 1 10:49:41 1994 Bill Cox (bill@rtl.cygnus.com) + + * Makefile.in: Rename HOST_ONLY to NATIVE. + * configure: Delete SunOs patch suffix from host_canonical + and build_canonical variables that are prepended to Makefiles. + * configure.in: Add comments for easier maintenance. + Tue May 31 19:39:47 1994 Jim Kingdon (kingdon@lioth.cygnus.com) * Makefile.in: Add all-libproc target similar to all-gui. diff --git a/Makefile.in b/Makefile.in index b3580ea..a9a57bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -366,22 +366,22 @@ ALL_MODULES = \ all-uudecode \ all-wdiff - # This is a list of the check targets for all of the modules which are # compiled using $(FLAGS_TO_PASS). # This is a list of the check targets for all of the modules which are # compiled using $(FLAGS_TO_PASS). # -# The list is in two parts. Those that only have checks when -# compiling -CROSS_CHECK_MODULES = \ +# The list is in two parts. The first lists those tools which +# are tested as part of the host's native tool-chain, and not +# tested in a cross configuration. +NATIVE_CHECK_MODULES = \ + check-byacc \ check-flex -HOST_ONLY_CHECK_MODULES = \ +CROSS_CHECK_MODULES = \ check-autoconf \ check-bfd \ check-binutils \ - check-byacc \ check-cvs \ check-dejagnu \ check-diff \ @@ -422,7 +422,8 @@ HOST_ONLY_CHECK_MODULES = \ check-time \ check-uudecode \ check-wdiff -CHECK_MODULES=$(HOST_ONLY_CHECK_MODULES) $(CROSS_CHECK_MODULES) + +CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES) # This is a list of the install targets for all of the modules which are # compiled using $(FLAGS_TO_PASS). @@ -713,9 +714,9 @@ $(ALL_MODULES) all-glob all-gui all-libproc: # This rule is used to check the modules which use FLAGS_TO_PASS. To # build a target check-X means to cd to X and make all. -.PHONY: $(CHECK_MODULES) $(HOST_ONLY_CHECK_MODULES) $(CROSS_CHECK_MODULES) -$(HOST_ONLY_CHECK_MODULES): - if [ $(host_canonical) = $(target_canonical) ] ; then \ +.PHONY: $(CHECK_MODULES) $(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES) +$(NATIVE_CHECK_MODULES): + if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ @dir=`echo $@ | sed -e 's/check-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ @@ -276,10 +276,8 @@ do --x-i* | --x-l*) other_options="$other_options $orig_option" ;; --*) - echo "Warning: Unrecognized option: \"$orig_option\"". >&2 - # Pass the option to any configure scripts in subdirectories - # in case they recognize it. - other_options="$other_options $orig_option" + echo "configure: Unrecognized option: \"$orig_option\"; use --help for usage." >&2 + exit 1 ;; *) case $undefs in @@ -362,7 +360,7 @@ esac if [ -n "${fatal}" -o "${host_alias}" = "help" ] ; then exec 1>&2 - echo Usage: configure HOST + echo Usage: configure [OPTIONS] HOST echo echo Options: [defaults in brackets] echo ' --prefix=MYDIR configure for installation of host independent files into MYDIR. ["/usr/local"]' @@ -384,7 +382,7 @@ if [ -n "${fatal}" -o "${host_alias}" = "help" ] ; then echo ' --enable-FOO, --enable-FOO=BAR include feature FOO (parameter BAR)' echo ' --disable-FOO do not include feature FOO' echo - echo 'Where HOST and TARGET are something like "vax", "sun3", "encore", etc.' + echo 'Where HOST and TARGET are something like "sun4", "decstation", "encore", etc.' echo if [ -r config.status ] ; then cat config.status @@ -634,9 +632,15 @@ for subdir in . ${subdirs} ; do fi ${remove} -f ${link} - # Make a symlink if possible, otherwise try a hard link - ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link} - + # Make a symlink if possible, otherwise try a hard link + if ${symbolic_link} ${srcdir}/${file} ${link} >/dev/null 2>&1 ; then + true + else + # We need to re-remove the file because Lynx leaves a + # very strange directory there when it fails an NFS symlink. + ${remove} -r -f ${link} + ${hard_link} ${srcdir}/${file} ${link} + fi if [ ! -r ${link} ] ; then echo '***' "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2 exit 1 @@ -751,6 +755,11 @@ EOF # real copy now in ${subdir}/Makefile.tem + # Remove patch suffixes from host name. + # See similar code in configure.in. + # Example: 'sparc-sun-sunos4.1.3_U1' + host_osnop=`echo ${host_os} | sed '/sunos/s/_U1//'` + # prepend warning about editting, and a bunch of variables. rm -f ${Makefile} cat > ${Makefile} <<EOF @@ -761,7 +770,7 @@ host_alias = ${host_alias} host_cpu = ${host_cpu} host_vendor = ${host_vendor} host_os = ${host_os} -host_canonical = ${host_cpu}-${host_vendor}-${host_os} +host_canonical = ${host_cpu}-${host_vendor}-${host_osnop} target_alias = ${target_alias} target_cpu = ${target_cpu} target_vendor = ${target_vendor} @@ -770,12 +779,13 @@ target_canonical = ${target_cpu}-${target_vendor}-${target_os} EOF case "${build}" in "") ;; - *) cat >> ${Makefile} << EOF + *) build_osnop=`echo ${build_os} | sed '/sunos/s/_U1//'` + cat >> ${Makefile} << EOF build_alias = ${build_alias} build_cpu = ${build_cpu} build_vendor = ${build_vendor} build_os = ${build_os} -build_canonical = ${build_cpu}-${build_vendor}-${build_os} +build_canonical = ${build_cpu}-${build_vendor}-${build_osnop} EOF esac diff --git a/configure.in b/configure.in index f83324c..932cc25 100644 --- a/configure.in +++ b/configure.in @@ -149,12 +149,13 @@ esac is_cross_compiler= -# Remove patch suffixes from host and target names +# Remove patch suffixes from host and target names. # Example: 'sparc-sun-sunos4.1.3_U1' +# See similar code in configure. hostnop=`echo ${host} | sed '/sun-sunos/s/_U1//'` targetnop=`echo ${target} | sed '/sun-sunos/s/_U1//'` -if [ x"${host}" = x"${target}" ] ; then +if [ x"${hostnop}" = x"${targetnop}" ] ; then # when doing a native toolchain, don't build the targets # that are in the 'cross only' list for i in ${cross_only} ; do |