Move static linking into wrapper code.

status-im · Mar 20, 2024 · e5804f3 · e5804f3
1 parent 4b39c1c
commit e5804f3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/config.nims b/config.nims
@@ -12,17 +12,8 @@ when fileExists("nimble.paths"):
   include "nimble.paths"
 # end Nimble config
 
-switch("gcc.exe", "gcc")
-
 when defined(rocksdb_static_linking):
-  import std/[os, strutils]
-
-  const libsDir = currentSourcePath.parentDir().replace('\\', '/') & "/build/lib"
-
   switch("gcc.linkerexe", "g++") # use the C++ linker profile because it's a C++ library
   switch("dynlibOverride", "librocksdb.a")
   switch("dynlibOverride", "liblz4.a")
   switch("dynlibOverride", "libzstd.a")
-  switch("l", libsDir & "/librocksdb.a")
-  switch("l", libsDir & "/liblz4.a")
-  switch("l", libsDir & "/libzstd.a")
diff --git a/rocksdb/columnfamily/cfopts.nim b/rocksdb/columnfamily/cfopts.nim
@@ -36,7 +36,7 @@ proc defaultColFamilyOptions*(): ColFamilyOptionsRef =
   let opts = newColFamilyOptions()
 
   rocksdb_options_set_compression(opts.cPtr, rocksdb_lz4_compression)
-  rocksdb_options_set_bottommost_compression(opts.cPtr, rocksdb_zstd_compression)
+  # rocksdb_options_set_bottommost_compression(opts.cPtr, rocksdb_zstd_compression)
 
   # Enable creating column families if they do not exist
   opts.setCreateMissingColumnFamilies(true)

diff --git a/rocksdb/lib/librocksdb.nim b/rocksdb/lib/librocksdb.nim
@@ -113,7 +113,18 @@ type
 ##  DB operations
 
 when defined(rocksdb_static_linking):
+  import std/[os, strutils]
+
   {.pragma: importrocks, importc, cdecl.}
+
+  const
+    topLevelPath = currentSourcePath.parentDir().parentDir().parentDir()
+    libsDir = topLevelPath.replace('\\', '/') & "/build/lib"
+
+  {.passL: libsDir & "/librocksdb.a".}
+  {.passL: libsDir & "/liblz4.a".}
+  {.passL: libsDir & "/libzstd.a".}
+
   when defined(windows):
     {.passL: "-lshlwapi -lrpcrt4".}
 else:

diff --git a/rocksdb/options/backupopts.nim b/rocksdb/options/backupopts.nim
@@ -33,7 +33,7 @@ proc cPtr*(engineOpts: BackupEngineOptionsRef): BackupEngineOptionsPtr =
 proc defaultBackupEngineOptions*(): BackupEngineOptionsRef {.inline.} =
   let opts = newBackupEngineOptions()
   rocksdb_options_set_compression(opts.cPtr, rocksdb_lz4_compression)
-  rocksdb_options_set_bottommost_compression(opts.cPtr, rocksdb_zstd_compression)
+  # rocksdb_options_set_bottommost_compression(opts.cPtr, rocksdb_zstd_compression)
   opts
 
 

diff --git a/rocksdb/options/dbopts.nim b/rocksdb/options/dbopts.nim
@@ -51,7 +51,7 @@ proc defaultDbOptions*(): DbOptionsRef =
   let opts: DbOptionsRef = newDbOptions()
 
   rocksdb_options_set_compression(opts.cPtr, rocksdb_lz4_compression)
-  rocksdb_options_set_bottommost_compression(opts.cPtr, rocksdb_zstd_compression)
+  # rocksdb_options_set_bottommost_compression(opts.cPtr, rocksdb_zstd_compression)
 
   # Optimize RocksDB. This is the easiest way to get RocksDB to perform well:
   opts.setIncreaseParallelism(countProcessors())