[c++] g++ includes, compiler bits

Benjamin Kosnik bkoz@redhat.com
Mon Feb 5 21:54:00 GMT 2001


..here are the compiler bits. Alex, Mark, I think this does what
everybody wants to do. Can you verify for me that this resolves the RPM issue?

thanks,
benjamin

2001-02-05  Benjamin Kosnik  <bkoz@redhat.com>

	* Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Change to target
	subdir of gcc_gxx_include_dir.
	(gcc_gxx_target_include_dir): Remove.


Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/Makefile.in,v
retrieving revision 1.598
diff -c -p -r1.598 Makefile.in
*** Makefile.in	2001/02/05 22:55:18	1.598
--- Makefile.in	2001/02/06 05:51:53
*************** slibdir = @slibdir@
*** 318,325 ****
  build_tooldir = $(exec_prefix)/$(target_alias)
  # Directory in which the compiler finds target-independent g++ includes.
  gcc_gxx_include_dir = @gcc_gxx_include_dir@
- # Directory in which the compiler finds target-dependent g++ includes.
- gcc_gxx_target_include_dir = $(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/$(target_alias)/include/@libstdcxx_incdir@
  # Directory to search for site-specific includes.
  includedir = $(local_prefix)/include
  # assertdir is overridden in cross-make.
--- 318,323 ----
*************** intl.all intl.install intl.uninstall \
*** 1910,1916 ****
  PREPROCESSOR_DEFINES = \
    -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
    -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
!   -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_target_include_dir)\" \
    -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
    -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
    -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\"
--- 1908,1914 ----
  PREPROCESSOR_DEFINES = \
    -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
    -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
!   -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_alias)\" \
    -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
    -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
    -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\"


More information about the Gcc-patches mailing list