fix nim-lang#15955: --app:staticlib -d:nimLinkerWeakSymbols allows us…

…ing weak symbols
timotheecour · Feb 8, 2021 · 4fef3a3 · 4fef3a3
1 parent a9f44b7
commit 4fef3a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
@@ -1360,7 +1360,7 @@ proc genMainProc(m: BModule) =
       "}$N$N"
 
     NimMainProc =
-      "N_CDECL(void, NimMain)(void) {$N" &
+      "N_LIB_PRIVATE N_CDECL(void, NimMain)(void) {$N" &
         "\tvoid (*volatile inner)(void);$N" &
         "$4" &
         "\tinner = NimMainInner;$N" &

diff --git a/lib/nimbase.h b/lib/nimbase.h
@@ -173,6 +173,7 @@ __AVR__
 
 #if defined(WIN32) || defined(_WIN32) /* only Windows has this mess... */
 #  define N_LIB_PRIVATE
+#  define N_LIB_WEAK __declspec(selectany)# 
 #  define N_CDECL(rettype, name) rettype __cdecl name
 #  define N_STDCALL(rettype, name) rettype __stdcall name
 #  define N_SYSCALL(rettype, name) rettype __syscall name
@@ -196,6 +197,7 @@ __AVR__
 #  define N_LIB_IMPORT  extern __declspec(dllimport)
 #else
 #  define N_LIB_PRIVATE __attribute__((visibility("hidden")))
+#  define N_LIB_WEAK __attribute__((weak))
 #  if defined(__GNUC__)
 #    define N_CDECL(rettype, name) rettype name
 #    define N_STDCALL(rettype, name) rettype name