Fix build error messaging
This commit is contained in:
parent
13e5ce7e22
commit
94b3b04e6d
1 changed files with 5 additions and 2 deletions
|
|
@ -208,11 +208,12 @@ proc buildLibrary(lname, outdir, conFlags, cmakeFlags, makeFlags: string, buildT
|
||||||
var
|
var
|
||||||
lpath = findFile(lname, outdir, regex = true)
|
lpath = findFile(lname, outdir, regex = true)
|
||||||
makePath = outdir
|
makePath = outdir
|
||||||
|
buildStatus: BuildStatus
|
||||||
|
errors: seq[string]
|
||||||
|
|
||||||
if lpath.nBl:
|
if lpath.nBl:
|
||||||
return lpath
|
return lpath
|
||||||
|
|
||||||
var buildStatus: BuildStatus
|
|
||||||
|
|
||||||
for buildType in buildTypes:
|
for buildType in buildTypes:
|
||||||
case buildType
|
case buildType
|
||||||
|
|
@ -223,6 +224,8 @@ proc buildLibrary(lname, outdir, conFlags, cmakeFlags, makeFlags: string, buildT
|
||||||
|
|
||||||
if buildStatus.built:
|
if buildStatus.built:
|
||||||
break
|
break
|
||||||
|
elif buildStatus.error.nBl:
|
||||||
|
errors.add buildStatus.error
|
||||||
|
|
||||||
if buildStatus.buildPath.len > 0:
|
if buildStatus.buildPath.len > 0:
|
||||||
let libraryExists = findFile(lname, buildStatus.buildPath, regex = true).len > 0
|
let libraryExists = findFile(lname, buildStatus.buildPath, regex = true).len > 0
|
||||||
|
|
@ -231,7 +234,7 @@ proc buildLibrary(lname, outdir, conFlags, cmakeFlags, makeFlags: string, buildT
|
||||||
make(buildStatus.buildPath, lname, makeFlags, regex = true)
|
make(buildStatus.buildPath, lname, makeFlags, regex = true)
|
||||||
buildStatus.built = true
|
buildStatus.built = true
|
||||||
|
|
||||||
let error = if buildStatus.error.len > 0: buildStatus.error else: "No build files found in " & outdir
|
let error = if errors.len > 0: errors.join("\n") else: "No build files found in " & outdir
|
||||||
doAssert buildStatus.built, &"\nBuild configuration failed - {error}\n"
|
doAssert buildStatus.built, &"\nBuild configuration failed - {error}\n"
|
||||||
|
|
||||||
result = findFile(lname, outdir, regex = true)
|
result = findFile(lname, outdir, regex = true)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue