← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ghdl/quantal

« back to all changes in this revision

Viewing changes to gcc/gcc/c-incpath.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2011-09-30 09:16:02 UTC
  • Revision ID: package-import@ubuntu.com-20110930091602-usdap7ajgizmpvb1
Tags: 0.29+gcc4.3.4+dfsg-1ubuntu1
https://launchpad.net/bugs/770812
* Fix FTBFS on multiarch systems. LP: #770812.
* Don't build the package twice.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gcc/gcc/c-incpath.c
148
148
              if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
149
149
                {
150
150
                  char *str = concat (iprefix, p->fname + len, NULL);
151
 
                  if (p->multilib && imultilib)
 
151
                  if (p->multilib == 1 && imultilib)
152
152
                    str = concat (str, dir_separator_str, imultilib, NULL);
 
153
                  else if (p->multilib == 2)
 
154
                    {
 
155
                      if (!imultiarch)
 
156
                        continue;
 
157
                      str = concat (str, dir_separator_str, imultiarch, NULL);
 
158
                    }
153
159
                  add_path (str, SYSTEM, p->cxx_aware, false);
154
160
                }
155
161
            }
193
199
          else
194
200
            str = update_path (p->fname, p->component);
195
201
 
196
 
          if (p->multilib && imultilib)
 
202
          if (p->multilib == 1 && imultilib)
197
203
            str = concat (str, dir_separator_str, imultilib, NULL);
 
204
          else if (p->multilib == 2)
 
205
            {
 
206
              if (!imultiarch)
 
207
                continue;
 
208
              str = concat (str, dir_separator_str, imultiarch, NULL);
 
209
            }
198
210
 
199
211
          add_path (str, SYSTEM, p->cxx_aware, false);
200
212
        }