This commit is contained in:
Ganesh Viswanathan 2020-06-16 22:57:28 -05:00
commit 0a014e084f
2 changed files with 3 additions and 3 deletions

View file

@ -176,7 +176,7 @@ proc cpFile*(source, dest: string, psymlink = false, move = false) =
"mv -f"
else:
if psymlink:
"cp -fd"
"cp -fa"
else:
"cp -f"
@ -1055,7 +1055,7 @@ proc getDynlibExt(): string =
elif defined(linux) or defined(FreeBSD):
result = "\\.so[0-9.]*"
elif defined(macosx):
result = "\\.dylib[0-9.]*"
result = "[0-9.\\-]*\\.dylib"
var
gDefines {.compileTime.} = initTable[string, string]()

View file

@ -94,7 +94,7 @@ proc parseJBBArtifacts(pkg: JBBPackage, outdir: string) =
break
proc findJBBLibs(pkg: JBBPackage, outdir: string) =
pkg.sharedLibs = findFiles("(bin|lib)[\\\\/].*\\.(so|dll|dynlib)[0-9.]*", outdir)
pkg.sharedLibs = findFiles("(bin|lib)[\\\\/].*\\.(so|dll|dylib)[0-9.]*", outdir)
for lib in findFiles("lib[\\\\/].*\\.(a|lib)$", outdir):
if not lib.endsWith(".dll.a"):