← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .svn/pristine/d4/d4ed46ce557dd3c5bbfdf68cafcfec1cd7bc7d45.svn-base

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-12-19 19:48:34 UTC
  • Revision ID: package-import@ubuntu.com-20141219194834-4dz1q7rrn5pad823
Tags: 4.8.4-1
* GCC 4.8.4 release.
  - Fix PR target/61407 (darwin), PR middle-end/58624 (ice),
    PR sanitizer/64265 (wrong code).
* Require recent binutils to pass go test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.svn/pristine/d4/d4ed46ce557dd3c5bbfdf68cafcfec1cd7bc7d45.svn-base
 
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\"