mirror of
https://github.com/nim-lang/Nim.git
synced 2026-04-19 05:50:30 +00:00
bugfix: openssl import for macosx
This commit is contained in:
@@ -61,8 +61,6 @@ proc InitDefines*() =
|
||||
DefineSymbol("nimmixin")
|
||||
DefineSymbol("nimeffects")
|
||||
DefineSymbol("nimbabel")
|
||||
when defined(useFFI):
|
||||
DefineSymbol("nimffi")
|
||||
|
||||
# add platform specific symbols:
|
||||
case targetCPU
|
||||
|
||||
@@ -33,6 +33,9 @@ proc getDll(cache: var TDllCache; dll: string): pointer =
|
||||
InternalError("cannot load: " & dll)
|
||||
cache[dll] = result
|
||||
|
||||
const
|
||||
nkPtrLit = nkIntLit # hopefully we can get rid of this hack soon
|
||||
|
||||
proc importcSymbol*(sym: PSym): PNode =
|
||||
let name = ropeToStr(sym.loc.r)
|
||||
|
||||
|
||||
@@ -157,6 +157,9 @@ proc CommandInteractive =
|
||||
#setTarget(osNimrodVM, cpuNimrodVM)
|
||||
initDefines()
|
||||
DefineSymbol("nimrodvm")
|
||||
when hasFFI:
|
||||
DefineSymbol("nimffi")
|
||||
|
||||
registerPass(verbosePass())
|
||||
registerPass(sem.semPass())
|
||||
registerPass(evals.evalPass()) # load system module:
|
||||
|
||||
@@ -48,14 +48,14 @@ when defined(WINDOWS):
|
||||
else:
|
||||
const
|
||||
versions = "(|.1.0.0|.0.9.9|.0.9.8|.0.9.7|.0.9.6|.0.9.5|.0.9.4)"
|
||||
when defined(posix):
|
||||
const
|
||||
DLLSSLName = "libssl.so" & versions
|
||||
DLLUtilName = "libcrypto.so" & versions
|
||||
else:
|
||||
when defined(macosx):
|
||||
const
|
||||
DLLSSLName = "libssl.dylib" & versions
|
||||
DLLUtilName = "libcrypto.dylib" & versions
|
||||
else:
|
||||
const
|
||||
DLLSSLName = "libssl.so" & versions
|
||||
DLLUtilName = "libcrypto.so" & versions
|
||||
|
||||
type
|
||||
SslStruct {.final, pure.} = object
|
||||
|
||||
Reference in New Issue
Block a user