diff options
Diffstat (limited to 'debian/patches/cross-install-location.diff')
| -rw-r--r-- | debian/patches/cross-install-location.diff | 200 |
1 files changed, 80 insertions, 120 deletions
diff --git a/debian/patches/cross-install-location.diff b/debian/patches/cross-install-location.diff index 162ea4f..9d6669d 100644 --- a/debian/patches/cross-install-location.diff +++ b/debian/patches/cross-install-location.diff @@ -1,9 +1,7 @@ -Index: b/src/fixincludes/Makefile.in -=================================================================== --- a/src/fixincludes/Makefile.in +++ b/src/fixincludes/Makefile.in @@ -52,9 +52,9 @@ target_noncanonical:=@target_noncanonica - gcc_version := $(shell cat $(srcdir)/../gcc/BASE-VER) + gcc_version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER) # Directory in which the compiler finds libraries etc. -libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) @@ -14,11 +12,18 @@ Index: b/src/fixincludes/Makefile.in # Where our executable files go itoolsdir = $(libexecsubdir)/install-tools # Where our data files go -Index: b/src/libgfortran/Makefile.in -=================================================================== --- a/src/libgfortran/Makefile.in +++ b/src/libgfortran/Makefile.in -@@ -604,12 +604,12 @@ libgfortran_la_LDFLAGS = -version-info ` +@@ -717,7 +717,7 @@ gcc_version := $(shell @get_gcc_base_ver + @LIBGFOR_USE_SYMVER_GNU_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = $(srcdir)/gfortran.map + @LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = gfortran.map-sun + gfor_c_HEADERS = $(srcdir)/ISO_Fortran_binding.h +-gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include ++gfor_cdir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include + LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ + $(lt_host_flags) + +@@ -732,12 +732,12 @@ libgfortran_la_LDFLAGS = -version-info ` libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) cafexeclib_LTLIBRARIES = libcaf_single.la @@ -33,11 +38,18 @@ Index: b/src/libgfortran/Makefile.in @IEEE_SUPPORT_TRUE@nodist_finclude_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \ -I$(srcdir)/$(MULTISRCTOP)../gcc/config $(LIBQUADINCLUDE) \ -Index: b/src/libgfortran/Makefile.am -=================================================================== --- a/src/libgfortran/Makefile.am +++ b/src/libgfortran/Makefile.am -@@ -43,14 +43,14 @@ libgfortran_la_LDFLAGS = -version-info ` +@@ -31,7 +31,7 @@ version_dep = + endif + + gfor_c_HEADERS = $(srcdir)/ISO_Fortran_binding.h +-gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include ++gfor_cdir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include + + LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ + $(lt_host_flags) +@@ -47,14 +47,14 @@ libgfortran_la_LDFLAGS = -version-info ` libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) cafexeclib_LTLIBRARIES = libcaf_single.la @@ -54,38 +66,32 @@ Index: b/src/libgfortran/Makefile.am nodist_finclude_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod endif -Index: b/src/lto-plugin/Makefile.in -=================================================================== --- a/src/lto-plugin/Makefile.in +++ b/src/lto-plugin/Makefile.in -@@ -255,7 +255,7 @@ with_libiberty = @with_libiberty@ +@@ -338,7 +338,7 @@ with_libiberty = @with_libiberty@ ACLOCAL_AMFLAGS = -I .. -I ../config AUTOMAKE_OPTIONS = no-dependencies - gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) -libexecsubdir := $(libexecdir)/gcc/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix) +libexecsubdir := $(libexecdir)/gcc-cross/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix) AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) AM_CFLAGS = @ac_lto_plugin_warn_cflags@ AM_LDFLAGS = @ac_lto_plugin_ldflags@ -Index: b/src/lto-plugin/Makefile.am -=================================================================== --- a/src/lto-plugin/Makefile.am +++ b/src/lto-plugin/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = no-dependencies - gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) target_noncanonical := @target_noncanonical@ -libexecsubdir := $(libexecdir)/gcc/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix) +libexecsubdir := $(libexecdir)/gcc-cross/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix) AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) AM_CFLAGS = @ac_lto_plugin_warn_cflags@ -Index: b/src/libitm/Makefile.in -=================================================================== --- a/src/libitm/Makefile.in +++ b/src/libitm/Makefile.in -@@ -334,8 +334,8 @@ SUBDIRS = testsuite - gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +@@ -458,8 +458,8 @@ SUBDIRS = testsuite + gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) abi_version = -fabi-version=4 search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) -fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude @@ -95,11 +101,9 @@ Index: b/src/libitm/Makefile.in AM_CPPFLAGS = $(addprefix -I, $(search_path)) AM_CFLAGS = $(XCFLAGS) AM_CXXFLAGS = $(XCFLAGS) -std=gnu++0x -funwind-tables -fno-exceptions \ -Index: b/src/libitm/Makefile.am -=================================================================== --- a/src/libitm/Makefile.am +++ b/src/libitm/Makefile.am -@@ -11,8 +11,8 @@ abi_version = -fabi-version=4 +@@ -12,8 +12,8 @@ abi_version = -fabi-version=4 config_path = @config_path@ search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) @@ -110,11 +114,9 @@ Index: b/src/libitm/Makefile.am vpath % $(strip $(search_path)) -Index: b/src/gcc/gcc.c -=================================================================== --- a/src/gcc/gcc.c +++ b/src/gcc/gcc.c -@@ -4179,7 +4179,7 @@ process_command (unsigned int decoded_op +@@ -4482,7 +4482,7 @@ process_command (unsigned int decoded_op GCC_EXEC_PREFIX is typically a directory name with a trailing / (which is ignored by make_relative_prefix), so append a program name. */ @@ -123,7 +125,7 @@ Index: b/src/gcc/gcc.c gcc_libexec_prefix = get_relative_prefix (tmp_prefix, standard_exec_prefix, standard_libexec_prefix); -@@ -4205,15 +4205,15 @@ process_command (unsigned int decoded_op +@@ -4508,15 +4508,15 @@ process_command (unsigned int decoded_op { int len = strlen (gcc_exec_prefix); @@ -143,11 +145,9 @@ Index: b/src/gcc/gcc.c } set_std_prefix (gcc_exec_prefix, len); -Index: b/src/gcc/Makefile.in -=================================================================== --- a/src/gcc/Makefile.in +++ b/src/gcc/Makefile.in -@@ -592,9 +592,9 @@ libexecdir = @libexecdir@ +@@ -617,9 +617,9 @@ libexecdir = @libexecdir@ # -------- # Directory in which the compiler finds libraries etc. @@ -159,7 +159,7 @@ Index: b/src/gcc/Makefile.in # Directory in which all plugin resources are installed plugin_resourcesdir = $(libsubdir)/plugin # Directory in which plugin headers are installed -@@ -2017,8 +2017,8 @@ prefix.o: $(FULLVER) +@@ -2160,8 +2160,8 @@ default-d.o: config/default-d.c DRIVER_DEFINES = \ -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ @@ -167,10 +167,10 @@ Index: b/src/gcc/Makefile.in - -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \ + -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-cross/\" \ + -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc-cross/\" \ - -DDEFAULT_TARGET_VERSION=\"$(BASEVER_c)\" \ - -DDEFAULT_TARGET_FULL_VERSION=\"$(FULLVER_c)\" \ + -DDEFAULT_TARGET_VERSION=\"$(version)\" \ -DDEFAULT_REAL_TARGET_MACHINE=\"$(real_target_noncanonical)\" \ -@@ -2671,7 +2671,7 @@ PREPROCESSOR_DEFINES = \ + -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \ +@@ -2853,7 +2853,7 @@ PREPROCESSOR_DEFINES = \ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ -DNATIVE_SYSTEM_HEADER_DIR=\"$(NATIVE_SYSTEM_HEADER_DIR)\" \ -DPREFIX=\"$(prefix)/\" \ @@ -178,25 +178,21 @@ Index: b/src/gcc/Makefile.in + -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-cross/\" \ @TARGET_SYSTEM_ROOT_DEFINE@ - CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s) -Index: b/src/libssp/Makefile.in -=================================================================== + CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s) --- a/src/libssp/Makefile.in +++ b/src/libssp/Makefile.in -@@ -287,7 +287,7 @@ gcc_version := $(shell cat $(top_srcdir) +@@ -365,7 +365,7 @@ gcc_version := $(shell @get_gcc_base_ver @LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@version_dep = ssp.map-sun - AM_CFLAGS = -Wall + AM_CFLAGS = -Wall $(XCFLAGS) toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la -libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include +libsubincludedir = $(libdir)/gcc-cross/$(target_noncanonical)/$(gcc_version)/include nobase_libsubinclude_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h libssp_la_SOURCES = \ ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \ -Index: b/src/libssp/Makefile.am -=================================================================== --- a/src/libssp/Makefile.am +++ b/src/libssp/Makefile.am -@@ -39,7 +39,7 @@ AM_CFLAGS = -Wall +@@ -39,7 +39,7 @@ AM_CFLAGS += $(XCFLAGS) toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la target_noncanonical = @target_noncanonical@ @@ -205,21 +201,17 @@ Index: b/src/libssp/Makefile.am nobase_libsubinclude_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h libssp_la_SOURCES = \ -Index: b/src/libquadmath/Makefile.in -=================================================================== --- a/src/libquadmath/Makefile.in +++ b/src/libquadmath/Makefile.in -@@ -354,7 +354,7 @@ AUTOMAKE_OPTIONS = 1.8 foreign +@@ -467,7 +467,7 @@ AUTOMAKE_OPTIONS = foreign info-in-build @BUILD_LIBQUADMATH_TRUE@libquadmath_la_DEPENDENCIES = $(version_dep) $(libquadmath_la_LIBADD) @BUILD_LIBQUADMATH_TRUE@nodist_libsubinclude_HEADERS = quadmath.h quadmath_weak.h -@BUILD_LIBQUADMATH_TRUE@libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include +@BUILD_LIBQUADMATH_TRUE@libsubincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include @BUILD_LIBQUADMATH_TRUE@libquadmath_la_SOURCES = \ - @BUILD_LIBQUADMATH_TRUE@ math/x2y2m1q.c math/isinf_nsq.c math/acoshq.c math/fmodq.c \ + @BUILD_LIBQUADMATH_TRUE@ math/x2y2m1q.c math/acoshq.c math/fmodq.c \ @BUILD_LIBQUADMATH_TRUE@ math/acosq.c math/frexpq.c \ -Index: b/src/libquadmath/Makefile.am -=================================================================== --- a/src/libquadmath/Makefile.am +++ b/src/libquadmath/Makefile.am @@ -41,7 +41,7 @@ libquadmath_la_LDFLAGS = -version-info ` @@ -230,13 +222,11 @@ Index: b/src/libquadmath/Makefile.am +libsubincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include libquadmath_la_SOURCES = \ - math/x2y2m1q.c math/isinf_nsq.c math/acoshq.c math/fmodq.c \ -Index: b/src/libobjc/Makefile.in -=================================================================== + math/x2y2m1q.c math/acoshq.c math/fmodq.c \ --- a/src/libobjc/Makefile.in +++ b/src/libobjc/Makefile.in -@@ -50,7 +50,7 @@ top_builddir = . - -include ../boehm-gc/threads.mk +@@ -48,7 +48,7 @@ extra_ldflags_libobjc = @extra_ldflags_l + top_builddir = . libdir = $(exec_prefix)/lib -libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) @@ -244,54 +234,46 @@ Index: b/src/libobjc/Makefile.in # Multilib support variables. MULTISRCTOP = -Index: b/src/libada/Makefile.in -=================================================================== --- a/src/libada/Makefile.in +++ b/src/libada/Makefile.in @@ -68,7 +68,7 @@ GCC_DIR=$(MULTIBUILDTOP)../../$(host_sub target_noncanonical:=@target_noncanonical@ - version := $(shell cat $(srcdir)/../gcc/BASE-VER) + version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER) -libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR) +libsubdir := $(libdir)/gcc-cross/$(target_noncanonical)/$(version)$(MULTISUBDIR) ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR)) - ADA_RTS_SUBDIR=./rts$(subst /,_,$(MULTISUBDIR)) -Index: b/src/libgomp/Makefile.in -=================================================================== + # exeext should not be used because it's the *host* exeext. We're building --- a/src/libgomp/Makefile.in +++ b/src/libgomp/Makefile.in -@@ -386,8 +386,8 @@ gcc_version := $(shell cat $(top_srcdir) +@@ -521,8 +521,8 @@ gcc_version := $(shell @get_gcc_base_ver search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \ $(top_srcdir)/../include --fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude +-fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude -libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include -+fincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/finclude ++fincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude +libsubincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include AM_CPPFLAGS = $(addprefix -I, $(search_path)) AM_CFLAGS = $(XCFLAGS) AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS) -Index: b/src/libgomp/Makefile.am -=================================================================== --- a/src/libgomp/Makefile.am +++ b/src/libgomp/Makefile.am -@@ -10,8 +10,8 @@ config_path = @config_path@ +@@ -11,8 +11,8 @@ config_path = @config_path@ search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \ $(top_srcdir)/../include --fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude +-fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude -libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include -+fincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/finclude ++fincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude +libsubincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include vpath % $(strip $(search_path)) -Index: b/src/libgcc/Makefile.in -=================================================================== --- a/src/libgcc/Makefile.in +++ b/src/libgcc/Makefile.in -@@ -186,7 +186,7 @@ STRIP = @STRIP@ +@@ -199,7 +199,7 @@ STRIP = @STRIP@ STRIP_FOR_TARGET = $(STRIP) # Directory in which the compiler finds libraries etc. @@ -300,67 +282,30 @@ Index: b/src/libgcc/Makefile.in # Used to install the shared libgcc. slibdir = @slibdir@ # Maybe used for DLLs on Windows targets. -Index: b/src/libjava/Makefile.in -=================================================================== ---- a/src/libjava/Makefile.in -+++ b/src/libjava/Makefile.in -@@ -825,8 +825,8 @@ write_entries_to_file = $(shell rm -f $( - - - # This is required by TL_AC_GXX_INCLUDE_DIR. --libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) --libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) -+libsubdir = $(libdir)/gcc-cross/$(target_noncanonical)/$(gcc_version) -+libexecsubdir = $(libexecdir)/gcc-cross/$(target_noncanonical)/$(gcc_version) - toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \ - $(am__append_2) $(am__append_3) $(am__append_4) - toolexecmainlib_DATA = libgcj.spec -Index: b/src/libjava/Makefile.am -=================================================================== ---- a/src/libjava/Makefile.am -+++ b/src/libjava/Makefile.am -@@ -35,9 +35,9 @@ write_entries_to_file = $(shell rm -f $( - target_noncanonical = @target_noncanonical@ - - # This is required by TL_AC_GXX_INCLUDE_DIR. --libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) -+libsubdir = $(libdir)/gcc-cross/$(target_noncanonical)/$(gcc_version) - --libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) -+libexecsubdir = $(libexecdir)/gcc-cross/$(target_noncanonical)/$(gcc_version) - - ## - ## What gets installed, and where. -Index: b/src/libffi/include/Makefile.am -=================================================================== --- a/src/libffi/include/Makefile.am +++ b/src/libffi/include/Makefile.am @@ -8,6 +8,6 @@ EXTRA_DIST=ffi.h.in # Where generated headers like ffitarget.h get installed. - gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) -toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include +toollibffidir := $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include toollibffi_HEADERS = ffi.h ffitarget.h -Index: b/src/libffi/include/Makefile.in -=================================================================== --- a/src/libffi/include/Makefile.in +++ b/src/libffi/include/Makefile.in -@@ -251,7 +251,7 @@ EXTRA_DIST = ffi.h.in +@@ -321,7 +321,7 @@ EXTRA_DIST = ffi.h.in # Where generated headers like ffitarget.h get installed. - gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) -toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include +toollibffidir := $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include toollibffi_HEADERS = ffi.h ffitarget.h all: all-am -Index: b/src/libcc1/Makefile.am -=================================================================== --- a/src/libcc1/Makefile.am +++ b/src/libcc1/Makefile.am -@@ -35,7 +35,7 @@ libiberty = $(if $(wildcard $(libiberty_ +@@ -37,7 +37,7 @@ libiberty = $(if $(wildcard $(libiberty_ $(Wc)$(libiberty_normal))) libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) @@ -369,21 +314,17 @@ Index: b/src/libcc1/Makefile.am cc1libdir = $(libdir)/$(libsuffix) if ENABLE_PLUGIN -Index: b/src/libcc1/Makefile.in -=================================================================== --- a/src/libcc1/Makefile.in +++ b/src/libcc1/Makefile.in -@@ -290,7 +290,7 @@ libiberty = $(if $(wildcard $(libiberty_ +@@ -393,7 +393,7 @@ libiberty = $(if $(wildcard $(libiberty_ $(Wc)$(libiberty_normal))) libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) -plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin +plugindir = $(libdir)/gcc-cross/$(target_noncanonical)/$(gcc_version)/plugin cc1libdir = $(libdir)/$(libsuffix) - @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la + @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la -Index: b/src/libsanitizer/Makefile.am -=================================================================== --- a/src/libsanitizer/Makefile.am +++ b/src/libsanitizer/Makefile.am @@ -1,6 +1,6 @@ @@ -394,11 +335,9 @@ Index: b/src/libsanitizer/Makefile.am nodist_saninclude_HEADERS = -Index: b/src/libsanitizer/Makefile.in -=================================================================== --- a/src/libsanitizer/Makefile.in +++ b/src/libsanitizer/Makefile.in -@@ -285,7 +285,7 @@ top_build_prefix = @top_build_prefix@ +@@ -357,7 +357,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I .. -I ../config @@ -407,3 +346,24 @@ Index: b/src/libsanitizer/Makefile.in nodist_saninclude_HEADERS = $(am__append_1) @SANITIZER_SUPPORTED_TRUE@SUBDIRS = sanitizer_common $(am__append_2) \ @SANITIZER_SUPPORTED_TRUE@ $(am__append_3) lsan asan ubsan \ +--- a/src/libphobos/configure.ac ++++ b/src/libphobos/configure.ac +@@ -200,6 +200,8 @@ AC_SUBST(SPEC_PHOBOS_DEPS) + libtool_VERSION=76:3:0 + AC_SUBST(libtool_VERSION) + ++# trigger rebuild of the configure file ++ + # Set default flags (after DRUNTIME_WERROR!) + if test -z "$GDCFLAGS"; then + GDCFLAGS="-Wall $WERROR_FLAG -g -frelease -O2" +--- a/src/libphobos/m4/druntime.m4 ++++ b/src/libphobos/m4/druntime.m4 +@@ -105,6 +105,7 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES], + + # Default case for install directory for D sources files. + gdc_include_dir='$(libdir)/gcc/${target_alias}/${gcc_version}/include/d' ++ gdc_include_dir='${libdir}/gcc-cross/${target_alias}'/${gcc_version}/include/d + AC_SUBST(gdc_include_dir) + ]) + |