jyapayne/nimterop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix OSX

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
nimterop/build.nim
View file

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

2
nimterop/jbb.nim
View file

@ -94,7 +94,7 @@ proc parseJBBArtifacts(pkg: JBBPackage, outdir: string) =
break break
proc findJBBLibs(pkg: JBBPackage, outdir: string) = 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): for lib in findFiles("lib[\\\\/].*\\.(a|lib)$", outdir):
if not lib.endsWith(".dll.a"): if not lib.endsWith(".dll.a"):