diff --git a/Makefile b/Makefile index 094eb414..dfa0b023 100644 --- a/Makefile +++ b/Makefile @@ -260,12 +260,12 @@ libcodex: ifeq ($(STATIC), 1) echo -e $(BUILD_MSG) "build/$@.a" && \ - $(ENV_SCRIPT) nim libcodexStatic $(NIM_PARAMS) -d:chronicles_sinks=textlines[dynamic],json[dynamic],textlines[dynamic] codex.nims + $(ENV_SCRIPT) nim libcodexStatic $(NIM_PARAMS) codex.nims else ifeq ($(detected_OS),Windows) echo -e $(BUILD_MSG) "build/$@.dll" && \ - $(ENV_SCRIPT) nim libcodexDynamic $(NIM_PARAMS) -d:chronicles_sinks=textlines,json[file],textlines[file] codex.nims + $(ENV_SCRIPT) nim libcodexDynamic $(NIM_PARAMS) codex.nims else echo -e $(BUILD_MSG) "build/$@.so" && \ - $(ENV_SCRIPT) nim libcodexDynamic $(NIM_PARAMS) -d:chronicles_sinks=textlines[dynamic],json[dynamic],textlines[dynamic] codex.nims + $(ENV_SCRIPT) nim libcodexDynamic $(NIM_PARAMS) codex.nims endif endif # "variables.mk" was not included diff --git a/build.nims b/build.nims index 52d7878a..2a1823ab 100644 --- a/build.nims +++ b/build.nims @@ -32,19 +32,18 @@ proc buildLibrary(name: string, srcDir = "./", params = "", `type` = "dynamic") if `type` == "dynamic": exec "nim c" & " --out:build/" & name & ".so --threads:on --app:lib --opt:size --noMain --mm:refc --header --d:metrics " & - "--nimMainPrefix:libcodex --skipParentCfg:on -d:noSignalHandler " & - "-d:LeopardCmakeFlags=\"-DCMAKE_POSITION_INDEPENDENT_CODE=ON\" " & + "--nimMainPrefix:libcodex -d:noSignalHandler " & + "-d:LeopardExtraCompilerFlags=-fPIC " & "-d:chronicles_runtime_filtering " & "-d:chronicles_log_level=TRACE " & - "-d:libp2p_pki_schemes=secp256k1 " & params & " " & srcDir & name & ".nim" else: exec "nim c" & " --out:build/" & name & ".a --threads:on --app:staticlib --opt:size --noMain --mm:refc --header --d:metrics " & - "--nimMainPrefix:libcodex --skipParentCfg:on -d:noSignalHandler " & + "--nimMainPrefix:libcodex -d:noSignalHandler " & + "-d:LeopardExtraCompilerFlags=-fPIC " & "-d:chronicles_runtime_filtering " & "-d:chronicles_log_level=TRACE " & - "-d:libp2p_pki_schemes=secp256k1 " & params & " " & srcDir & name & ".nim" proc test(name: string, srcDir = "tests/", params = "", lang = "c") = diff --git a/library/codex_thread_requests/requests/node_upload_request.nim b/library/codex_thread_requests/requests/node_upload_request.nim index c4ed75d8..fc253798 100644 --- a/library/codex_thread_requests/requests/node_upload_request.nim +++ b/library/codex_thread_requests/requests/node_upload_request.nim @@ -278,7 +278,7 @@ proc streamFile( ## file I/O with chronos, see https://github.com/status-im/nim-chronos/issues/501. try: - let inputStreamHandle = filePath.fileInput() + let inputStreamHandle = filepath.fileInput() let inputStream = inputStreamHandle.implicitDeref var buf = newSeq[byte](chunkSize)