diff options
| author | Mike Stump <mrs@gcc.gnu.org> | 1996-09-18 17:20:21 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 1996-09-18 17:20:21 +0000 |
| commit | 7fcdf4c26b5181466cec06573b45580eb686a22b (patch) | |
| tree | fc47233cd08ae0a07b5e0ae900f6f6a42caae953 /gcc/cp/mpw-make.sed | |
| parent | 4a1b3b10c8913cdcbae077b495891c80aef72796 (diff) | |
| download | gcc-7fcdf4c26b5181466cec06573b45580eb686a22b.zip gcc-7fcdf4c26b5181466cec06573b45580eb686a22b.tar.gz gcc-7fcdf4c26b5181466cec06573b45580eb686a22b.tar.bz2 | |
89th Cygnus<->FSF quick merge
From-SVN: r12738
Diffstat (limited to 'gcc/cp/mpw-make.sed')
| -rw-r--r-- | gcc/cp/mpw-make.sed | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gcc/cp/mpw-make.sed b/gcc/cp/mpw-make.sed index e821e9b..120b5a1 100644 --- a/gcc/cp/mpw-make.sed +++ b/gcc/cp/mpw-make.sed @@ -43,11 +43,13 @@ LIBDEPS = \ /^SUBDIR_MALLOC/s/`.*`// # Point includes at parent directly correctly. -/^INCLUDES = .*$/s/:\./::/g -/^INCLUDES = .*$/s/"{srcdir}"\.\./"{topsrcdir}"gcc:/g +/^INCLUDES = /s/:\./::/g +/^INCLUDES = /s/"{srcdir}"\.\./"{topsrcdir}"gcc:/g +/^INCLUDES = /s,"{srcdir}"/\.\.,"{topsrcdir}"gcc:,g +/^INCLUDES = /s,"{srcdir}":config,"{topsrcdir}"gcc:config:,g # Add the special MPW include dirs. -/^INCLUDES = .*$/s/$/ -i "{topsrcdir}"include:mpw: -i :::extra-include:/ +/^INCLUDES = /s/$/ -i "{topsrcdir}"include:mpw: -i :::extra-include:/ # A nasty hack to reduce confusion. /true/s/ ; @true$// @@ -101,7 +103,7 @@ LIBDEPS = \ # Fix the compile line for the generated parser. /{CC} -c/,/echo {PARSE_C}/c\ - {CC} {ALL_CFLAGS} {ALL_CPPFLAGS} {INCLUDES} {BIG_SWITCHFLAG} "{o}"parse.c -o "{o}"parse.c.o\ + {CC} @DASH_C_FLAG@ {ALL_CFLAGS} {ALL_CPPFLAGS} {INCLUDES} {BIG_SWITCHFLAG} "{o}"parse.c -o "{o}"parse.c.o\ # Change all Rez commands to use mac-gcc.r. /{REZ}/s/"{s}"[-a-zA-Z{}]*\.r/"{topsrcdir}"gcc:mac-gcc.r/ |