diff options
Diffstat (limited to 'lib/compilers/win32-mingw-gcc.ts')
-rw-r--r-- | lib/compilers/win32-mingw-gcc.ts | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/lib/compilers/win32-mingw-gcc.ts b/lib/compilers/win32-mingw-gcc.ts index 715b1e0c1..8be71cf56 100644 --- a/lib/compilers/win32-mingw-gcc.ts +++ b/lib/compilers/win32-mingw-gcc.ts @@ -24,12 +24,7 @@ import path from 'path'; -import { - BuildResult, - BypassCache, - CompilationResult, - ExecutionOptions, -} from '../../types/compilation/compilation.interfaces.js'; +import {BuildResult, BypassCache, CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {copyNeededDlls} from '../win-utils.js'; @@ -41,8 +36,10 @@ export class Win32MingWGcc extends GCCCompiler { return 'win32-mingw-gcc'; } - getExtraPaths(): string[] { - return [path.normalize(path.dirname(this.compiler.exe))]; + override getExtraPaths(): string[] { + const paths: string[] = super.getExtraPaths(); + + return [...paths, path.normalize(path.dirname(this.compiler.exe))]; } override optionsForFilter( @@ -82,15 +79,6 @@ export class Win32MingWGcc extends GCCCompiler { ); } - override getDefaultExecOptions(): ExecutionOptions & {env: Record<string, string>} { - const options = super.getDefaultExecOptions(); - if (!options.env) options.env = {}; - if (!options.env.PATH) options.env.PATH = ''; - options.env.PATH = this.getExtraPaths().join(path.delimiter); - - return options; - } - override async buildExecutableInFolder(key, dirPath: string): Promise<BuildResult> { const result = await super.buildExecutableInFolder(key, dirPath); |