From: Fred Fish <fnf@ninemoons.com>
To: jason@cygnus.com (Jason Merrill)
Cc: law@cygnus.com, egcs@cygnus.com
Subject: Re: Implications of tighter integration of libg++
Date: Mon, 09 Feb 1998 15:33:00 -0000 [thread overview]
Message-ID: <199802092049.NAA30035@ninemoons.com> (raw)
In-Reply-To: <u9iuqov9k7.fsf@yorick.cygnus.com>
> > So would you prefer the status quo for headers and libs, or would you
> > prefer to see them pushed down into libsubdir?
>
> libsubdir, I suppose.
The below patch is what we use in Geek Gadgets to get gcc to look under
libsubdir for g++ include files, ahead of the normal include dir:
* Makefile.in (cccp.o): Define GPLUSPLUS_INCLUDE_DIR_SPECIFIC
when compiling.
* cccp.c (include_defaults_array): Add GPLUSPLUS_INCLUDE_DIR_SPECIFIC
ahead of GPLUSPLUS_INCLUDE_DIR entry.
* cpplib.c (include_defaults_array): Add GPLUSPLUS_INCLUDE_DIR_SPECIFIC
ahead of GPLUSPLUS_INCLUDE_DIR entry.
*** Makefile.in 1997/11/24 04:15:29 1.1.1.8
--- Makefile.in 1998/01/21 17:20:42 1.13
***************
*** 1735,1740 ****
--- 1764,1770 ----
# is for compatibility with the current version of libg++.
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
+ -DGPLUSPLUS_INCLUDE_DIR_SPECIFIC=\"$(libsubdir)/include/g++\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
-DOLD_GPLUSPLUS_INCLUDE_DIR=\"$(old_gxx_include_dir)\" \
-DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
***************
*** 1752,1757 ****
--- 1782,1788 ----
cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
+ -DGPLUSPLUS_INCLUDE_DIR_SPECIFIC=\"$(libsubdir)/include/g++\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
-DOLD_GPLUSPLUS_INCLUDE_DIR=\"$(old_gxx_include_dir)\" \
-DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
***************
*** 1789,1794 ****
--- 1820,1826 ----
stamp-proto: protoize.c getopt.h $(CONFIG_H)
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
+ -DGPLUSPLUS_INCLUDE_DIR_SPECIFIC=\"$(libsubdir)/include/g++\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
-DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
-DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
***************
*** 1798,1803 ****
--- 1830,1836 ----
mv protoize$(objext) unprotoize$(objext)
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
+ -DGPLUSPLUS_INCLUDE_DIR_SPECIFIC=\"$(libsubdir)/include/g++\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
-DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
-DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
***************
*** 1828,1833 ****
--- 1861,1867 ----
./protoize -N -B ./ -x getopt.h -c "-B./ -Wall -Wwrite-strings \
$(CFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=0 \
+ -DGPLUSPLUS_INCLUDE_DIR_SPECIFIC=0 \
-DGPLUSPLUS_INCLUDE_DIR=0 \
-DCROSS_INCLUDE_DIR=0 \
-DTOOL_INCLUDE_DIR=0 \
***************
*** 1838,1843 ****
--- 1872,1878 ----
./unprotoize -N -x getopt.h -c "-B./ -Wall -Wwrite-strings \
$(CFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=0 \
+ -DGPLUSPLUS_INCLUDE_DIR_SPECIFIC=0 \
-DGPLUSPLUS_INCLUDE_DIR=0 \
-DCROSS_INCLUDE_DIR=0 \
-DTOOL_INCLUDE_DIR=0 \
*** cccp.c 1997/10/10 21:53:17 1.1.1.2
--- cccp.c 1998/01/21 18:12:27 1.2
***************
*** 588,593 ****
--- 593,600 ----
= INCLUDE_DEFAULTS;
#else
= {
+ /* Pick up GNU C++ specific include files for specific gcc release. */
+ { GPLUSPLUS_INCLUDE_DIR_SPECIFIC, 1, 1 },
/* Pick up GNU C++ specific include files. */
{ GPLUSPLUS_INCLUDE_DIR, 1, 1 },
{ OLD_GPLUSPLUS_INCLUDE_DIR, 1, 1 },
*** cpplib.c 1997/09/18 23:24:03 1.1.1.2
--- cpplib.c 1998/01/21 18:24:39 1.3
***************
*** 361,366 ****
--- 366,373 ----
= INCLUDE_DEFAULTS;
#else
= {
+ /* Pick up GNU C++ specific include files for specific gcc release. */
+ { GPLUSPLUS_INCLUDE_DIR_SPECIFIC, 1, 1},
/* Pick up GNU C++ specific include files. */
{ GPLUSPLUS_INCLUDE_DIR, 1, 1 },
{ OLD_GPLUSPLUS_INCLUDE_DIR, 1, 1 },
prev parent reply other threads:[~1998-02-09 15:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
1997-11-24 23:19 Loren J. Rittle
1997-11-25 6:52 ` Manfred.Hollstein
1998-02-09 2:22 ` Jeffrey A Law
1998-02-09 7:13 ` Martin von Loewis
1998-02-09 14:46 ` Joe Buck
1998-02-09 15:33 ` Martin von Loewis
1998-02-09 21:34 ` Joe Buck
1998-02-10 0:53 ` John A. Tamplin
1998-02-10 10:30 ` Joe Buck
1998-02-09 21:34 ` H.J. Lu
1998-02-09 11:54 ` Joe Buck
1998-02-09 14:46 ` H.J. Lu
[not found] ` <5837.887019874.cygnus.egcs@hurl.cygnus.com>
1998-02-09 11:31 ` Jason Merrill
1998-02-09 11:54 ` Jeffrey A Law
1998-02-09 11:54 ` Jason Merrill
1998-02-09 15:33 ` Fred Fish [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=199802092049.NAA30035@ninemoons.com \
--to=fnf@ninemoons.com \
--cc=egcs@cygnus.com \
--cc=jason@cygnus.com \
--cc=law@cygnus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).