User account creation filtered due to spam.

View | Details | Raw Unified | Return to bug 11572 | Differences between
and this patch

Collapse All | Expand All

(-)gcc/c-incpath.c (-1 / +22 lines)
Lines 28-33 Link Here
28
#include "c-incpath.h"
28
#include "c-incpath.h"
29
#include "cppdefault.h"
29
#include "cppdefault.h"
30
30
31
extern int flag_next_runtime;
32
31
/* Windows does not natively support inodes, and neither does MSDOS.
33
/* Windows does not natively support inodes, and neither does MSDOS.
32
   Cygwin's emulation can generate non-unique inodes, so don't use it.
34
   Cygwin's emulation can generate non-unique inodes, so don't use it.
33
   VMS has non-numeric inodes.  */
35
   VMS has non-numeric inodes.  */
Lines 123-129 Link Here
123
  const struct default_include *p;
125
  const struct default_include *p;
124
  size_t len;
126
  size_t len;
125
127
126
  if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0)
128
  len = cpp_GCC_INCLUDE_DIR_len;
129
130
  if (len != 0 && iprefix)
127
    {
131
    {
128
      /* Look for directories that start with the standard prefix.
132
      /* Look for directories that start with the standard prefix.
129
	 "Translate" them, ie. replace /usr/local/lib/gcc... with
133
	 "Translate" them, ie. replace /usr/local/lib/gcc... with
Lines 141-146 Link Here
141
		{
145
		{
142
		  char *str = concat (iprefix, p->fname + len, NULL);
146
		  char *str = concat (iprefix, p->fname + len, NULL);
143
		  add_path (str, SYSTEM, p->cxx_aware);
147
		  add_path (str, SYSTEM, p->cxx_aware);
148
149
		  /* The following should only be included if 
150
		     configured with objc.  */
151
		  if (!flag_next_runtime)
152
		    {
153
		      str = concat (str, "/libobjc", NULL);
154
		      add_path (str, SYSTEM, p->cxx_aware);
155
		    }
144
		}
156
		}
145
	    }
157
	    }
146
	}
158
	}
Lines 159-164 Link Here
159
	    str = update_path (p->fname, p->component);
171
	    str = update_path (p->fname, p->component);
160
172
161
	  add_path (str, SYSTEM, p->cxx_aware);
173
	  add_path (str, SYSTEM, p->cxx_aware);
174
175
	  /* The following should only be included if 
176
	     configured with objc.  */
177
	  if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len) 
178
	      && !flag_next_runtime)
179
	    {
180
	      str = concat (str, "/libobjc", NULL);
181
	      add_path (str, SYSTEM, p->cxx_aware);
182
	    }
162
	}
183
	}
163
    }
184
    }
164
}
185
}
(-)libobjc/Makefile.in (-2 / +2 lines)
Lines 330-339 Link Here
330
330
331
# Copy Objective C headers to installation include directory.
331
# Copy Objective C headers to installation include directory.
332
install-headers:
332
install-headers:
333
	$(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(libsubdir)/include/objc
333
	$(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(libsubdir)/include/libobjc/objc
334
	for file in $(OBJC_H); do \
334
	for file in $(OBJC_H); do \
335
	  realfile=$(srcdir)/objc/$${file}; \
335
	  realfile=$(srcdir)/objc/$${file}; \
336
	  $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/include/objc; \
336
	  $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/include/libobjc/objc; \
337
	done
337
	done
338
338
339
check uninstall install-strip dist installcheck installdirs:
339
check uninstall install-strip dist installcheck installdirs:

Return to bug 11572