From b3d42f944badc8075505857af00344b0ed483a57 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Thu, 27 Jan 2022 08:41:39 -0600
Subject: [PATCH] ca65: parse new error msgs

---
 src/worker/tools/cc65.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/worker/tools/cc65.ts b/src/worker/tools/cc65.ts
index 947d3653..d38394e1 100644
--- a/src/worker/tools/cc65.ts
+++ b/src/worker/tools/cc65.ts
@@ -1,7 +1,7 @@
 
 import { getRootBasePlatform } from "../../common/util";
 import { CodeListingMap, WorkerError } from "../../common/workertypes";
-import { re_crlf, BuildStepResult, anyTargetChanged, execMain, gatherFiles, msvcErrorMatcher, populateEntry, populateExtraFiles, populateFiles, print_fn, putWorkFile, setupFS, staleFiles, BuildStep, emglobal, loadNative, moduleInstFn, fixParamsWithDefines, store } from "../workermain";
+import { re_crlf, BuildStepResult, anyTargetChanged, execMain, gatherFiles, msvcErrorMatcher, populateEntry, populateExtraFiles, populateFiles, print_fn, putWorkFile, setupFS, staleFiles, BuildStep, emglobal, loadNative, moduleInstFn, fixParamsWithDefines, store, makeErrorMatcher } from "../workermain";
 import { EmscriptenModule } from "../workermain"
 
 
@@ -108,7 +108,7 @@ export function assembleCA65(step: BuildStep): BuildStepResult {
             noInitialRun: true,
             //logReadFiles:true,
             print: print_fn,
-            printErr: msvcErrorMatcher(errors),
+            printErr: makeErrorMatcher(errors, /(.+?):(\d+): (.+)/, 2, 3, step.path, 1),
         });
         var FS = CA65.FS;
         setupFS(FS, '65-' + getRootBasePlatform(step.platform));