Skip to content

R
riscv-gcc-1
Commit 89b3e3b4 by Richard Kenner
Options

(gxx_include_dir): Replacement for gxx_prefix. 

From-SVN: r6761
parent c31049fd
Showing with 5 additions and 5 deletions
gcc/Makefile.in
...@@ -155,8 +155,8 @@ bindir = $(exec_prefix)/bin ...@@ -155,8 +155,8 @@ bindir = $(exec_prefix)/bin
libdir = $(exec_prefix)/lib libdir = $(exec_prefix)/lib
# Directory in which the compiler finds executables, libraries, etc. # Directory in which the compiler finds executables, libraries, etc.
libsubdir = $(libdir)/gcc-lib/$(target)/$(version) libsubdir = $(libdir)/gcc-lib/$(target)/$(version)
# The prefix for g++ includes. # Directory in which the compiler finds g++ includes.
gxx_prefix= $(libdir) gxx_include_dir= $(libdir)/g++-include
# Directory to search for site-specific includes. # Directory to search for site-specific includes.
includedir = $(local_prefix)/include includedir = $(local_prefix)/include
# assertdir is overridden in cross-make. # assertdir is overridden in cross-make.
...@@ -1402,7 +1402,7 @@ cccp.o: cccp.c $(CONFIG_H) pcp.h version.c config.status ...@@ -1402,7 +1402,7 @@ cccp.o: cccp.c $(CONFIG_H) pcp.h version.c config.status
# is for compatibility with the current version of libg++. # is for compatibility with the current version of libg++.
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_prefix)/g++-include\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
-DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
-DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \ -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
-DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \ -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
...@@ -1427,7 +1427,7 @@ unprotoize.o: stamp-proto ; @true ...@@ -1427,7 +1427,7 @@ unprotoize.o: stamp-proto ; @true
stamp-proto: $(srcdir)/protoize.c getopt.h $(CONFIG_H) stamp-proto: $(srcdir)/protoize.c getopt.h $(CONFIG_H)
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_prefix)/g++-include\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
-DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \ -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
-DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \ -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
-DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
...@@ -1436,7 +1436,7 @@ stamp-proto: $(srcdir)/protoize.c getopt.h $(CONFIG_H) ...@@ -1436,7 +1436,7 @@ stamp-proto: $(srcdir)/protoize.c getopt.h $(CONFIG_H)
mv protoize.o unprotoize.o mv protoize.o unprotoize.o
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_prefix)/g++-include\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
-DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \ -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
-DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \ -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
-DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment