~ubuntu-branches/debian/sid/gcc-4.8/sid

78 by Matthias Klose
* GCC 4.8.4 release.
1
# DP: Set the D target include directory to a multiarch location.
2
3
--- a/src/gcc/d/Make-lang.in
4
+++ b/src/gcc/d/Make-lang.in
5
@@ -61,7 +61,11 @@
6
 	$(D_DMD_H)
7
 
8
 
9
-gcc_d_target_include_dir=$(gcc_d_include_dir)/$(target_noncanonical)
10
+ifneq (,$(MULTIARCH_DIRNAME))
11
+  gcc_d_target_include_dir = /usr/include/$(MULTIARCH_DIRNAME)/d/$(version)
12
+else
13
+  gcc_d_target_include_dir=$(gcc_d_include_dir)/$(target_noncanonical)
14
+endif
15
 
16
 # Name of phobos library
17
 D_LIBPHOBOS = -DLIBPHOBOS=\"gphobos2\"