use plugin for musl

commit_hash:e97d8794f04c155eaca0fa4161658142d04e4788

build/scripts/link_exe.py

@@ -27,9 +27,6 @@ def get_leaks_suppressions(cmd):
     return supp, newcmd
 
 
-MUSL_LIBS = '-lc', '-lcrypt', '-ldl', '-lm', '-lpthread', '-lrt', '-lutil'
-
-
 CUDA_LIBRARIES = {
     '-lcublas_static': '-lcublas',
     '-lcublasLt_static': '-lcublasLt',
@@ -258,14 +255,6 @@ def fix_sanitize_flag(cmd, opts):
     return flags
 
 
-def fix_cmd_for_musl(cmd):
-    flags = []
-    for flag in cmd:
-        if flag not in MUSL_LIBS:
-            flags.append(flag)
-    return flags
-
-
 def fix_cmd_for_dynamic_cuda(cmd):
     flags = []
     for flag in cmd:
@@ -325,7 +314,6 @@ def fix_blas_resolving(cmd):
 def parse_args(args):
     parser = optparse.OptionParser()
     parser.disable_interspersed_args()
-    parser.add_option('--musl', action='store_true')
     parser.add_option('--custom-step')
     parser.add_option('--python')
     parser.add_option('--source-root')
@@ -364,9 +352,6 @@ def parse_args(args):
     cmd = fix_blas_resolving(args)
     cmd = fix_py2(cmd)
     cmd = remove_excessive_flags(cmd)
-    if opts.musl:
-        cmd = fix_cmd_for_musl(cmd)
-
     cmd = fix_sanitize_flag(cmd, opts)
 
     if opts.dynamic_cuda:

build/ymake.core.conf

@@ -770,7 +770,6 @@ module _BASE_UNIT: _BARE_UNIT {
     when ($MUSL == "yes") {
         CFLAGS += -D_musl_
         LINK_DYN_LIB_FLAGS += --musl
-        LINK_SCRIPT_EXE_FLAGS += --musl
         PEERDIR+=contrib/libs/musl/include
     }
 

contrib/libs/musl/musl.pyplugin

@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import json
+
+
+MUSL_LIBS = '-lc', '-lcrypt', '-ldl', '-lm', '-lpthread', '-lrt', '-lutil'
+
+
+def fix_cmd_for_musl(cmd):
+    for flag in cmd:
+        if flag not in MUSL_LIBS:
+            yield flag
+
+
+if __name__ == '__main__':
+    sys.stdout.write(json.dumps(list(fix_cmd_for_musl(sys.argv[1:]))))

contrib/libs/musl/ya.make

@@ -60,6 +60,8 @@ CFLAGS(
     -D__libc_free=free
 )
 
+LD_PLUGIN(musl)
+
 EXTRALIBS(
     -nostdlib
     -fno-pie