Browse Source

Fix the compiler wrapper yet more...

Eric Andersen 23 years ago
parent
commit
70b1841fb5
2 changed files with 4 additions and 6 deletions
  1. 1 1
      extra/gcc-uClibc/Makefile
  2. 3 5
      extra/gcc-uClibc/gcc-uClibc.c

+ 1 - 1
extra/gcc-uClibc/Makefile

@@ -24,7 +24,7 @@ gcc-uClibc.h: $(TOPDIR)/Config
 	@echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h
 	@echo "#define GCC_LIB " \"$(GCC_LIB)\" >> gcc-uClibc.h
 	@echo "#define GCC_LIB_DIR " \"$(GCC_LIB_DIR)\" >> gcc-uClibc.h
-	@echo "#define GCC_INCDIR " \"-I$(GCCINCDIR)\" >> gcc-uClibc.h
+	@echo "#define GCC_INCDIR " \"$(GCCINCDIR)\" >> gcc-uClibc.h
 	@echo "#define TARGET_ARCH " \"$(TARGET_ARCH)\" >> gcc-uClibc.h
 	@echo "#define DYNAMIC_LINKER " \"$(DYNAMIC_LINKER)\" >> gcc-uClibc.h
 	@echo "#define BUILD_DYNAMIC_LINKER " \"$(UCLIBC_DIR)/lib/$(UCLIBC_LDSO)\" >> gcc-uClibc.h

+ 3 - 5
extra/gcc-uClibc/gcc-uClibc.c

@@ -172,8 +172,8 @@ int main(int argc, char **argv)
 	xstrcat(&(rpath[0]), "-Wl,-rpath,", devprefix, "/lib", NULL);
 	xstrcat(&(rpath[1]), "-Wl,-rpath,", builddir, "/lib", NULL);
 
-	xstrcat(&(uClibc_inc[0]), "-I", devprefix, "/include/", NULL);
-	xstrcat(&(uClibc_inc[1]), "-I", builddir, "/include/", NULL);
+	xstrcat(&(uClibc_inc[0]), "-isystem", devprefix, "/include/", NULL);
+	xstrcat(&(uClibc_inc[1]), "-isystem", builddir, "/include/", NULL);
 
 	xstrcat(&(crt0_path[0]), devprefix, "/lib/crt0.o", NULL);
 	xstrcat(&(crt0_path[1]), builddir, "/lib/crt0.o", NULL);
@@ -296,8 +296,6 @@ int main(int argc, char **argv)
 		} else if (strncmp("-v",argv[j], 2) == 0) {
 		    continue;
 		} else {
-			if (verbose)
-			    printf("gcc_argument[%d] = %s\n", k, argv[j]);
 			gcc_argument[k++] = argv[j];
 			gcc_argument[k] = '\0';
 		}
@@ -357,7 +355,7 @@ int main(int argc, char **argv)
 	    if (use_stdinc && source_count) {
 		gcc_argv[i++] = nostdinc;
 		gcc_argv[i++] = uClibc_inc[use_build_dir];
-		gcc_argv[i++] = GCC_INCDIR;
+		gcc_argv[i++] = "-isystem" GCC_INCDIR;
 		if( incstr )
 		    gcc_argv[i++] = incstr;
 	    }