diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2020-10-11 18:03:40 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2020-10-11 20:44:04 +0200 |
| commit | d66e274e1ac8e86266151ad0c48f7705b3bd1582 (patch) | |
| tree | ccee5baa7d619ed21e4892df475fcf3ccd509c82 | |
| parent | 3492178494484e0c0c1d8eec83aadc5b2ad06ede (diff) | |
| download | Nim-d66e274e1ac8e86266151ad0c48f7705b3bd1582.tar.gz | |
refactoring: moved setOutFile to where it belongs
| -rw-r--r-- | compiler/main.nim | 14 | ||||
| -rw-r--r-- | compiler/options.nim | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/compiler/main.nim b/compiler/main.nim index ab074aa1f..d85aa43dc 100644 --- a/compiler/main.nim +++ b/compiler/main.nim @@ -66,20 +66,6 @@ when not defined(leanCompiler): compileProject(graph) finishDoc2Pass(graph.config.projectName) -proc setOutFile(conf: ConfigRef) = - proc libNameTmpl(conf: ConfigRef): string {.inline.} = - result = if conf.target.targetOS == osWindows: "$1.lib" else: "lib$1.a" - - if conf.outFile.isEmpty: - let base = conf.projectName - let targetName = if optGenDynLib in conf.globalOptions: - platform.OS[conf.target.targetOS].dllFrmt % base - elif optGenStaticLib in conf.globalOptions: - libNameTmpl(conf) % base - else: - base & platform.OS[conf.target.targetOS].exeExt - conf.outFile = RelativeFile targetName - proc commandCompileToC(graph: ModuleGraph) = let conf = graph.config setOutFile(conf) diff --git a/compiler/options.nim b/compiler/options.nim index 6054eb3a5..2f796afe6 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -884,3 +884,18 @@ proc floatInt64Align*(conf: ConfigRef): int16 = # to 4bytes (except with -malign-double) return 4 return 8 + +proc setOutFile*(conf: ConfigRef) = + proc libNameTmpl(conf: ConfigRef): string {.inline.} = + result = if conf.target.targetOS == osWindows: "$1.lib" else: "lib$1.a" + + if conf.outFile.isEmpty: + let base = conf.projectName + let targetName = + if optGenDynLib in conf.globalOptions: + platform.OS[conf.target.targetOS].dllFrmt % base + elif optGenStaticLib in conf.globalOptions: + libNameTmpl(conf) % base + else: + base & platform.OS[conf.target.targetOS].exeExt + conf.outFile = RelativeFile targetName |