Attachment #240603 for bug #330395

View | Details | Raw Unified | Return to bug 330395
Collapse All | Expand All




# --------

# Directory in which the compiler finds libraries etc.
libsubdir = $(libdir)/gcc-code-assist/$(target_noncanonical)/$(version)
# Directory in which the compiler finds executables
libexecsubdir = $(libexecdir)/gcc-code-assist/$(target_noncanonical)/$(version)
# Used to produce a relative $(gcc_tooldir) in gcc.o
unlibsubdir = ../../..
# $(prefix), expressed as a path relative to $(libsubdir).

DRIVER_DEFINES = \
  -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
  -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
  -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc-code-assist/\" \
  -DDEFAULT_TARGET_VERSION=\"$(version)\" \
  -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
  -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \

Lines 1530-1536 Link Here

(-)gcc/gcc.c.orig (-1 / +1 lines)
1530	/* For native compilers, these are well-known paths containing	1530	/* For native compilers, these are well-known paths containing
1531	components that may be provided by the system. For cross	1531	components that may be provided by the system. For cross
1532	compilers, these paths are not used. */	1532	compilers, these paths are not used. */
1533	static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/";	1533	static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc-code-assist/";
1534	static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/";	1534	static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/";
1535	static const char *md_exec_prefix = MD_EXEC_PREFIX;	1535	static const char *md_exec_prefix = MD_EXEC_PREFIX;
1536	static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;	1536	static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;

Return to bug 330395

Lines 480-488 Link Here

(-)gcc/Makefile.in.orig (-3 / +3 lines)
480	# --------	480	# --------
481		481
482	# Directory in which the compiler finds libraries etc.	482	# Directory in which the compiler finds libraries etc.
483	libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version)	483	libsubdir = $(libdir)/gcc-code-assist/$(target_noncanonical)/$(version)
484	# Directory in which the compiler finds executables	484	# Directory in which the compiler finds executables
485	libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version)	485	libexecsubdir = $(libexecdir)/gcc-code-assist/$(target_noncanonical)/$(version)
486	# Used to produce a relative $(gcc_tooldir) in gcc.o	486	# Used to produce a relative $(gcc_tooldir) in gcc.o
487	unlibsubdir = ../../..	487	unlibsubdir = ../../..
488	# $(prefix), expressed as a path relative to $(libsubdir).	488	# $(prefix), expressed as a path relative to $(libsubdir).
Lines 1950-1956 Link Here
1950	DRIVER_DEFINES = \	1950	DRIVER_DEFINES = \
1951	-DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \	1951	-DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
1952	-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \	1952	-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
1953	-DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \	1953	-DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc-code-assist/\" \
1954	-DDEFAULT_TARGET_VERSION=\"$(version)\" \	1954	-DDEFAULT_TARGET_VERSION=\"$(version)\" \
1955	-DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \	1955	-DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
1956	-DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \	1956	-DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \