diff options
| author | Stan Cox <scox@cygnus.com> | 1999-04-02 14:30:18 +0000 |
|---|---|---|
| committer | Stan Cox <scox@gcc.gnu.org> | 1999-04-02 14:30:18 +0000 |
| commit | ffb6cec051ed5af80246b033238aa2b07dfa2185 (patch) | |
| tree | 379850366afc52bc6ff43182f787934f5a05fabe | |
| parent | 88101ab976e7d4f0df929ec525f6c576f7f22391 (diff) | |
| download | gcc-ffb6cec051ed5af80246b033238aa2b07dfa2185.zip gcc-ffb6cec051ed5af80246b033238aa2b07dfa2185.tar.gz gcc-ffb6cec051ed5af80246b033238aa2b07dfa2185.tar.bz2 | |
cygwin.h (CPP_SPEC): Use mingw_include_path instead of a hardcoded path for -mno-cygwin.
* config/i386/cygwin.h (CPP_SPEC): Use mingw_include_path instead
of a hardcoded path for -mno-cygwin.
(mingw_include_path): New.
From-SVN: r26127
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/i386/cygwin.h | 21 |
2 files changed, 24 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b545609..d576f5f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 2 14:35:45 1999 Stan Cox <scox@cygnus.com> + + * config/i386/cygwin.h (CPP_SPEC): Use mingw_include_path instead + of a hardcoded path for -mno-cygwin. + (mingw_include_path): New. + 1999-04-02 Joseph S. Myers <jsm28@cam.ac.uk> * pdp11.c: Include "recog.h". diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h index 1c23535..e4fad9a 100644 --- a/gcc/config/i386/cygwin.h +++ b/gcc/config/i386/cygwin.h @@ -86,7 +86,22 @@ Boston, MA 02111-1307, USA. */ #undef CPP_SPEC #define CPP_SPEC "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} \ %{!mno-cygwin:-D__CYGWIN32__ -D__CYGWIN__} \ - %{mno-cygwin:-iwithprefixbefore include/mingw32 -D__MINGW32__=0.2}" + %{mno-cygwin:-iwithprefixbefore \ + ../../../../%(mingw_include_path)/include/mingw32 -D__MINGW32__=0.2}" + +/* This macro defines names of additional specifications to put in the specs + that can be used in various specifications like CC1_SPEC. Its definition + is an initializer with a subgrouping for each command option. + + Each subgrouping contains a string constant, that defines the + specification name, and a string constant that used by the GNU CC driver + program. + + Do not define this macro if it does not need to do anything. */ + +#undef SUBTARGET_EXTRA_SPECS +#define SUBTARGET_EXTRA_SPECS \ + { "mingw_include_path", DEFAULT_TARGET_MACHINE } /* We have to dynamic link to get to the system DLLs. All of libc, libm and the Unix stuff is in cygwin.dll. The import library is called @@ -98,8 +113,8 @@ Boston, MA 02111-1307, USA. */ #define LIB_SPEC "%{pg:-lgmon} \ %{!mno-cygwin:-lcygwin} \ %{mno-cygwin:-lmingw32 -lmoldname -lcrtdll} \ - %{mwindows:-luser32 -lgdi32 -lcomdlg32} \ - -lkernel32 -ladvapi32 -lshell32" + %{mwindows:-lgdi32 -lcomdlg32} \ + -luser32 -lkernel32 -ladvapi32 -lshell32" #define LINK_SPEC "%{mwindows:--subsystem windows} \ %{mdll:--dll -e _DllMainCRTStartup@12}" |