Fix #16937; --clib option pass library name to backend C compiler cor…

…rectly (#19754) * Fix 16937: Make --clib option works * Make tests/compiler/tcmdlineclib.nim works from any current dir * Try to fix link error on macosx * Add a comment to tests/compiler/tcmdlineclib.nims Co-authored-by: Clay Sweetser <[email protected]>
nim-lang · Sep 1, 2022 · 2a34d14 · 2a34d14
1 parent a95b639
commit 2a34d14
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/compiler/commands.nim b/compiler/commands.nim
@@ -803,7 +803,7 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
   of "clib":
     expectArg(conf, switch, arg, pass, info)
     if pass in {passCmd2, passPP}:
-      conf.cLinkedLibs.add processPath(conf, arg, info).string
+      conf.cLinkedLibs.add arg
   of "header":
     if conf != nil: conf.headerFile = arg
     incl(conf.globalOptions, optGenIndex)

diff --git a/tests/compiler/samplelib.nim b/tests/compiler/samplelib.nim
@@ -0,0 +1,2 @@
+# Sample library used by tcmdlineclib.nim
+proc test(): int {.cdecl, exportc, dynlib.} = 123
diff --git a/tests/compiler/tcmdlineclib.nim b/tests/compiler/tcmdlineclib.nim
@@ -0,0 +1,3 @@
+proc test(): int {.importc, cdecl.}
+
+doAssert test() == 123
diff --git a/tests/compiler/tcmdlineclib.nims b/tests/compiler/tcmdlineclib.nims
@@ -0,0 +1,10 @@
+import os
+
+selfExec "c --app:lib " & (projectDir() / "samplelib.nim")
+switch("clibdir", projectDir())
+--clib:samplelib
+
+# Make test executable can load sample shared library.
+# `-rpath` option doesn't work and ignored on Windows.
+# But the dll file in same directory as executable file is loaded.
+switch("passL", "-Wl,-rpath," & projectDir())
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Sample library used by tcmdlineclib.nim
		proc test(): int {.cdecl, exportc, dynlib.} = 123
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		proc test(): int {.importc, cdecl.}

		doAssert test() == 123