diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | mpw-configure | 288 |
2 files changed, 234 insertions, 70 deletions
@@ -1,3 +1,19 @@ +Tue Sep 26 14:30:01 1995 Stan Shebs <shebs@andros.cygnus.com> + + Add PowerMac support and many other enhancements. + * mpw-configure: New option --cc to select compiler to use, + paste options set according to --cc into the generated + Makefile, generate the Makefile by sed'ing the Unix Makefile.in + if mpw-make.sed is present. + * mpw-config.in: Don't test for gC1, test for mpw-touch, + add forward includes for PowerPC include files. + * mpw-build.in: Build using Makefile.PPC if present. + (do-byacc, etc): Remove separate version resource builds. + (do-gas): Build "stamps" before "all". + (do-gcc): Build "stamps-h" and "stamps-c" before "all". + * mpw-README: Update to reflect --cc option, PowerMac support, + and recently-reported compatibility problems. + Fri Sep 22 12:15:42 1995 Doug Evans <dje@deneb.cygnus.com> * cfg-ml-com.in (m68*-*-*): Only build multilibs for diff --git a/mpw-configure b/mpw-configure index af0d494..9caee19 100644 --- a/mpw-configure +++ b/mpw-configure @@ -1,6 +1,26 @@ # Configuration script +# Copyright (C) 1994, 1995 Free Software Foundation, Inc. -### This script (and its config.in fragments) must NOT use any 8-bit chars! +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +### WARNING +### This script (and mpw-config.in fragments) must NOT use any 8-bit chars! +### WARNING + +# This is an MPW Shell script that sets everything up for compilation, +# mainly creating directories, and editing copies of files. Set savedir "`Directory`" @@ -16,11 +36,13 @@ Set objdir ":" Set prefix ":" -Set hostalias "m68k-apple-mpw" +Set host_alias "m68k-apple-mpw" + +Set target_alias {host_alias} -Set targetalias {hostalias} +Set host_cc "mpwc" -Set prefix "{Boot}"Cygnus:latest: +Set prefix "{MPW}":Cygnus:latest: Set verify 0 Set verifystr "" @@ -29,7 +51,13 @@ Set verifystr "" Loop Break If {#} == 0 - If "{1}" =~ /--prefix/ + If "{1}" =~ /--cc/ + Set host_cc "{2}" + Shift 1 + Else If "{1}" =~ /--host/ + Set host_alias "{2}" + Shift 1 + Else If "{1}" =~ /--prefix/ Set prefix "{2}" Shift 1 Else If "{1}" =~ /--srcdir/ @@ -39,7 +67,7 @@ Loop Set srcroot "{2}" Shift 1 Else If "{1}" =~ /--target/ - Set targetalias "{2}" + Set target_alias "{2}" Shift 1 Else If "{1}" =~ /-v/ Set verify 1 @@ -56,11 +84,106 @@ Set Exit 0 # (should interpret aliases if not in canonical form) -Set target_canonical "{targetalias}" +Set host_canonical "{host_alias}" -Set target_cpu "`echo {target_canonical} | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`" -Set target_vendor "`echo {target_canonical} | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`" -Set target_os "`echo {target_canonical} | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`" +Set target_canonical "{target_alias}" + +# Point to the correct set of tools to use with the chosen compiler. + +If "{host_cc}" =~ /mpwc/ + Set cc_name '{CC_MPW_C}' + Set segment_flag '-s {Default}' + Set ar_name '{AR_LIB}' + Set ranlib_name '{RANLIB_NULL}' + Set cc_ld_name '{CC_LD_LINK}' + Set prog_ext_name '{PROG_EXT_68K}' + Set extralibs_name '{EXTRALIBS_C}' + Set makepef_name '{MAKEPEF_NULL}' + Set rez_name '{REZ_68K}' +Else If "{host_cc}" =~ /sc68k/ + Set cc_name '{CC_SC}' + Set segment_flag '-s {Default}' + Set ar_name '{AR_LIB}' + Set ranlib_name '{RANLIB_NULL}' + Set cc_ld_name '{CC_LD_LINK}' + Set prog_ext_name '{PROG_EXT_68K}' + Set extralibs_name '{EXTRALIBS_C}' + Set makepef_name '{MAKEPEF_NULL}' + Set rez_name '{REZ_68K}' +Else If "{host_cc}" =~ /mwc68k/ + Set cc_name '{CC_MWC68K}' + Set segment_flag '-s {Default}' + Set ar_name '{AR_MWLINK68K}' + Set ranlib_name '{RANLIB_NULL}' + Set cc_ld_name '{CC_LD_MWLINK68K}' + Set prog_ext_name '{PROG_EXT_68K}' + Set extralibs_name '{EXTRALIBS_C}' + Set makepef_name '{MAKEPEF_NULL}' + Set rez_name '{REZ_PPC}' +Else If "{host_cc}" =~ /gcc68k/ + Set cc_name '{CC_68K_GCC}' + Set segment_flag '-s {Default}' + Set ar_name '{AR_68K_AR}' + Set ranlib_name '{RANLIB_RANLIB}' + Set cc_ld_name '{CC_68K_GCC}' + Set prog_ext_name '{PROG_EXT_68K}' + Set extralibs_name '{EXTRALIBS_C}' + Set makepef_name '{MAKEPEF_NULL}' + Set rez_name '{REZ_68K}' +Else If "{host_cc}" =~ /ppcc/ + Set cc_name '{CC_PPCC}' + Set segment_flag '' + Set ar_name '{AR_PPCLINK}' + Set ranlib_name '{RANLIB_NULL}' + Set cc_ld_name '{CC_LD_PPCLINK}' + Set prog_ext_name '{PROG_EXT_XCOFF}' + Set extralibs_name '{EXTRALIBS_PPC}' + Set makepef_name '{MAKEPEF_PPC}' + Set rez_name '{REZ_PPC}' +Else If "{host_cc}" =~ /mrc/ + Set cc_name '{CC_MRC}' + Set segment_flag '' + Set ar_name '{AR_PPCLINK}' + Set ranlib_name '{RANLIB_NULL}' + Set cc_ld_name '{CC_LD_PPCLINK}' + Set prog_ext_name '{PROG_EXT_XCOFF}' + Set extralibs_name '{EXTRALIBS_PPC}' + Set makepef_name '{MAKEPEF_PPC}' + Set rez_name '{REZ_PPC}' +Else If "{host_cc}" =~ /scppc/ + Set cc_name '{CC_SC}' + Set segment_flag '' + Set ar_name '{AR_PPCLINK}' + Set ranlib_name '{RANLIB_NULL}' + Set cc_ld_name '{CC_LD_PPCLINK}' + Set prog_ext_name '{PROG_EXT_XCOFF}' + Set extralibs_name '{EXTRALIBS_PPC}' + Set makepef_name '{MAKEPEF_PPC}' + Set rez_name '{REZ_PPC}' +Else If "{host_cc}" =~ /mwcppc/ + Set cc_name '{CC_MWCPPC}' + Set segment_flag '' + Set ar_name '{AR_MWLINKPPC}' + Set ranlib_name '{RANLIB_NULL}' + Set cc_ld_name '{CC_LD_MWLINKPPC}' + # Misleading, but we don't need a PEF step. + Set prog_ext_name '{PROG_EXT_68K}' + Set extralibs_name '{EXTRALIBS_MWCPPC}' + Set makepef_name '{MAKEPEF_NULL}' + Set rez_name '{REZ_PPC}' +Else If "{host_cc}" =~ /gccppc/ + Set cc_name '{CC_PPC_GCC}' + Set segment_flag '' + Set ar_name '{AR_PPCLINK}' + Set ranlib_name '{RANLIB_RANLIB}' + Set cc_ld_name '{CC_LD_PPCLINK}' + Set prog_ext_name '{PROG_EXT_XCOFF}' + Set extralibs_name '{EXTRALIBS_PPC}' + Set makepef_name '{MAKEPEF_PPC}' + Set rez_name '{REZ_PPC}' +Else + Echo "{host_cc}" is not a known MPW C compiler type +End If Set configdirs "" @@ -76,81 +199,109 @@ If "`Exists "{srcroot}"`" == "" Exit 1 End If +Set target_cpu "`echo {target_canonical} | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`" +Set target_vendor "`echo {target_canonical} | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`" +Set target_os "`echo {target_canonical} | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`" + +# Create a file that is guaranteed to be older than any other here. + +If "`Exists "{objdir}"_oldest`" == "" + mpw-touch _oldest +End If + +# Record this before creating any files, makefiles sometimes mention +# dependencies on config.status. + +Echo "# This directory was configured as follows:" >config.new +Echo "{ThisScript} --host {host_alias} --target {target_alias} --srcdir {srcdir} --srcroot {srcroot} --prefix {prefix} --cc {host_cc}" >>config.new +MoveIfChange config.new config.status + If "`Exists "{srcdir}"mpw-config.in`" != "" - Execute "{srcdir}"mpw-config.in + tr-7to8 "{srcdir}"mpw-config.in >"{objdir}"mpw-config.in + Execute "{objdir}"mpw-config.in +End If + +# Start Makefile construction by defining all the variables chosen by +# configuration. + +Echo "# This Makefile produced by mpw-configure. Changes may get lost!" > "{objdir}"Makefile.tem +Echo "srcroot = " {srcroot} >> "{objdir}"Makefile.tem +Echo "topsrcdir = " {srcroot} >> "{objdir}"Makefile.tem +Echo "srcdir = " {srcdir} >> "{objdir}"Makefile.tem +Echo "mpw_prefix = " {prefix} >> "{objdir}"Makefile.tem +Echo "host_alias = " {host_alias} >> "{objdir}"Makefile.tem +Echo "target_alias = " {target_alias} >> "{objdir}"Makefile.tem +Echo "target_cpu = " {target_cpu} >> "{objdir}"Makefile.tem +Echo "target_vendor = " {target_vendor} >> "{objdir}"Makefile.tem +Echo "target_os = " {target_os} >> "{objdir}"Makefile.tem +Echo "target_canonical = " {target_canonical} >> "{objdir}"Makefile.tem +Echo "host_makefile_frag = " >> "{objdir}"Makefile.tem +Echo "target_makefile_frag = " >> "{objdir}"Makefile.tem +Echo "CC = " {cc_name} >> "{objdir}"Makefile.tem +Echo "AR = " {ar_name} >> "{objdir}"Makefile.tem +Echo "RANLIB = " {ranlib_name} >> "{objdir}"Makefile.tem +Echo "CC_LD = " {cc_ld_name} >> "{objdir}"Makefile.tem +Echo "PROG_EXT = " {prog_ext_name} >> "{objdir}"Makefile.tem +Echo "EXTRALIBS = " {extralibs_name} >> "{objdir}"Makefile.tem +Echo "MAKEPEF = " {makepef_name} >> "{objdir}"Makefile.tem +Echo "REZ = " {rez_name} >> "{objdir}"Makefile.tem + +# Append the master set of definitions for the various compilers. + +If "`Exists "{srcdir}"config:mpw-mh-mpw`" != "" + tr-7to8 "{srcdir}"config:mpw-mh-mpw >>"{objdir}"Makefile.tem +Else If "`Exists "{srcroot}"config:mpw-mh-mpw`" != "" + tr-7to8 "{srcroot}"config:mpw-mh-mpw >>"{objdir}"Makefile.tem +Else + Echo "can't find a host config file!" + Exit 0 End If -If "`Exists "{srcdir}"mpw-xconfig.in`" != "" - Execute "{srcdir}"mpw-xconfig.in + +# Append anything produced by the directory's mpw-config.in. + +If "`Exists "{objdir}"mk.tmp`" != "" + Catenate "{objdir}"mk.tmp >>"{objdir}"Makefile.tem + # An mpw-config.in might change so as not to create this + # anymore, so get rid of it now to be safe. + Delete -i -y "{objdir}"mk.tmp End If -If "`Exists "{srcdir}"mpw-make.in`" != "" - Echo "# This Makefile produced by mpw-configure. Changes may get lost!" > "{objdir}"Makefile.tem - Echo "srcroot = " {srcroot} >> "{objdir}"Makefile.tem - Echo "topsrcdir = " {srcroot} >> "{objdir}"Makefile.tem - Echo "srcdir = " {srcdir} >> "{objdir}"Makefile.tem - Echo "mpw_prefix = " {prefix} >> "{objdir}"Makefile.tem - Echo "target_canonical = " {target_canonical} >> "{objdir}"Makefile.tem - # gcc definitions. - If "{mdname}" != "" - Echo "mdname = " {mdname} >> "{objdir}"Makefile.tem - End If - If "{maybe_target_default}" != "" - Echo "MAYBE_TARGET_DEFAULT = " {maybe_target_default} >> "{objdir}"Makefile.tem - End If - # binutils definitions. - Echo "ARCHDEFS = -d" {archname} >> "{objdir}"Makefile.tem - # ld definitions. - Echo "EMUL = " {emulname} >> "{objdir}"Makefile.tem - # gdb definitions. - If "{tdepfiles}" != "" - Echo "TDEPFILES = " {tdepfiles} >> "{objdir}"Makefile.tem - End If - If "{tm_file}" != "" - Echo "TM_FILE = " {tm_file} >> "{objdir}"Makefile.tem - End If - If "{xdepfiles}" != "" - Echo "XDEPFILES = " {xdepfiles} >> "{objdir}"Makefile.tem - End If - If "{xm_file}" != "" - Echo "XM_FILE = " {xm_file} >> "{objdir}"Makefile.tem - End If - If "{natdepfiles}" != "" - Echo "NATDEPFILES = " {nat_file} >> "{objdir}"Makefile.tem - End If - If "{nat_file}" != "" - Echo "NAT_FILE = " {nat_file} >> "{objdir}"Makefile.tem - End If - Echo "host_makefile_frag = " >> "{objdir}"Makefile.tem - Echo "target_makefile_frag = " >> "{objdir}"Makefile.tem - If "`Exists "{srcroot}"config:mpw-mh-mpw`" != "" - mpw-7to8 "{srcroot}"config:mpw-mh-mpw >>"{objdir}"Makefile.tem - Else If "`Exists "{srcroot}":config:mpw-mh-mpw`" != "" - mpw-7to8 "{srcroot}":config:mpw-mh-mpw >>"{objdir}"Makefile.tem - Else - Echo "can't find a host config file!" - Exit 0 +# If there is a sed script to edit the Unix Makefile.in, use it; otherwise +# use an mpw-make.in if present. + +If "`Exists "{srcdir}"mpw-make.sed`" != "" + sed -f "{srcroot}"utils:mpw:u2mpw-mf.sed "{srcdir}"Makefile.in >"{objdir}"Makefile.tem1 + sed -f "{srcdir}"mpw-make.sed "{objdir}"Makefile.tem1 >"{objdir}"Makefile.tem2 + sed -e "s/@SEGMENT_FLAG@/{segment_flag}/" "{objdir}"Makefile.tem2 >"{objdir}"mpw-make.in + tr-7to8 "{objdir}"mpw-make.in >>"{objdir}"Makefile.tem + MoveIfChange "{objdir}"Makefile.tem "{objdir}"Makefile + Delete -i -y "{objdir}"Makefile.tem[12] + If {verify} == 1 + Echo Created Makefile in "`Directory`" End If - mpw-7to8 "{srcdir}"mpw-make.in >>"{objdir}"Makefile.tem - mpw-edit-prefix "{objdir}"Makefile.tem >"{objdir}"Makefile.tem2 - Delete -i -y "{objdir}"Makefile.tem - MoveIfChange "{objdir}"Makefile.tem2 "{objdir}"Makefile +Else If "`Exists "{srcdir}"mpw-make.in`" != "" + sed -e 's/^prefix = .*$/prefix = {mpw_prefix}/g' "{srcdir}"mpw-make.in >"{objdir}"Makefile.tem1 + sed -e "s/@SEGMENT_FLAG@/{segment_flag}/" "{objdir}"Makefile.tem1 >"{objdir}"Makefile.tem2 + tr-7to8 "{objdir}"Makefile.tem2 >>"{objdir}"Makefile.tem + MoveIfChange "{objdir}"Makefile.tem "{objdir}"Makefile + Delete -i -y "{objdir}"Makefile.tem[12] If {verify} == 1 Echo Created Makefile in "`Directory`" End If End If +# Produce a build script if the source is defined. + If "`Exists "{srcdir}"mpw-build.in`" != "" Echo "Set srcroot " {srcroot} > "{objdir}"mpw-build.tem Echo "Set srcdir " {srcdir} >> "{objdir}"mpw-build.tem Echo "Set target_canonical " {target_canonical} >> "{objdir}"mpw-build.tem Echo "Set prefix " {prefix} >> "{objdir}"mpw-build.tem - mpw-7to8 "{srcdir}"mpw-build.in >>"{objdir}"mpw-build.tem + tr-7to8 "{srcdir}"mpw-build.in >>"{objdir}"mpw-build.tem MoveIfChange "{objdir}"mpw-build.tem "{objdir}"mpw-build If {verify} == 1 Echo Created mpw-build in "`Directory`" End If -Else - Echo '::mpw-build {1}' >"{objdir}"mpw-build End If For subdir In {configdirs} @@ -166,11 +317,8 @@ For subdir In {configdirs} NewFolder "{objdir}{subdir}" End If SetDirectory "{objdir}{subdir}:" - "{ThisScript}" --target "{target_canonical}" --srcdir "{srcdir}{subdir}:" --srcroot "{srcroot}" --prefix "{prefix}" {verifystr} + "{ThisScript}" --target "{target_canonical}" --srcdir "{srcdir}{subdir}:" --srcroot "{srcroot}" --prefix "{prefix}" --cc "{host_cc}" {verifystr} SetDirectory "{savedir}" End For -Echo "# This directory was configured as follows:" >config.status -Echo "mpw-configure --host {hostalias} --target {targetalias} --srcdir {srcdir}" >>config.status - SetDirectory "{savedir}" |