Re: wrappers and gcc -isystem

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

On 18/02/16 23:22, Jonathan Perkin wrote:
> Your patch only handles legacy wrappers, not cwrappers which is
> necessary for fast (bulk) builds.  If you can come up with a patch
> which handles cwrappers too (which would be required for integration
> anyway) then I'd be happy to test it.

OK, attached is the equivalent cwrappers patch (a much simpler thing).

cheers
mark

Index: files/bin/generic-transform-cc.c
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/pkgtools/cwrappers/files/bin/generic-transform-cc.c,v
retrieving revision 1.3
diff -u -r1.3 generic-transform-cc.c
--- files/bin/generic-transform-cc.c	19 Apr 2015 14:30:07 -0000	1.3
+++ files/bin/generic-transform-cc.c	20 Feb 2016 03:21:20 -0000
@@ -360,6 +360,20 @@
 			ruleset = &include_rules;
 			opt_arg = NULL;
 		}
+		else if (strcmp(arg->val, "-isystem") == 0) {
+			opt_arg = arg;
+			arg = arg2;
+			if (arg == NULL || arg->val[0] == '-') {
+				errx(255, "Missing argument for %s",
+				    opt_arg->val);
+			}
+			ruleset = &include_rules;
+			arg2 = TAILQ_NEXT(arg, link);
+			len = strlen(arg->val);
+			prefix = "";
+			path = arg->val;
+			rpath_mode = 1;
+		}
 #endif
 		else if (strncmp(arg->val, "-L", 2) == 0) {
 			len -= 2;