bugfix: openssl import for macosx

This commit is contained in:
Araq
2012-12-19 21:45:18 +01:00
parent c73d9fdd4c
commit b6c8e16b0f
4 changed files with 11 additions and 7 deletions

View File

@@ -61,8 +61,6 @@ proc InitDefines*() =
DefineSymbol("nimmixin")
DefineSymbol("nimeffects")
DefineSymbol("nimbabel")
when defined(useFFI):
DefineSymbol("nimffi")
# add platform specific symbols:
case targetCPU

View File

@@ -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)

View File

@@ -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:

View File

@@ -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