Skip to content

Commit 0d53cb6

Browse files
author
pg
committed
use plugin for musl
commit_hash:e97d8794f04c155eaca0fa4161658142d04e4788
1 parent dded852 commit 0d53cb6

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

build/scripts/link_exe.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ def get_leaks_suppressions(cmd):
2727
return supp, newcmd
2828

2929

30-
MUSL_LIBS = '-lc', '-lcrypt', '-ldl', '-lm', '-lpthread', '-lrt', '-lutil'
31-
32-
3330
CUDA_LIBRARIES = {
3431
'-lcublas_static': '-lcublas',
3532
'-lcublasLt_static': '-lcublasLt',
@@ -258,14 +255,6 @@ def fix_sanitize_flag(cmd, opts):
258255
return flags
259256

260257

261-
def fix_cmd_for_musl(cmd):
262-
flags = []
263-
for flag in cmd:
264-
if flag not in MUSL_LIBS:
265-
flags.append(flag)
266-
return flags
267-
268-
269258
def fix_cmd_for_dynamic_cuda(cmd):
270259
flags = []
271260
for flag in cmd:
@@ -325,7 +314,6 @@ def fix_blas_resolving(cmd):
325314
def parse_args(args):
326315
parser = optparse.OptionParser()
327316
parser.disable_interspersed_args()
328-
parser.add_option('--musl', action='store_true')
329317
parser.add_option('--custom-step')
330318
parser.add_option('--python')
331319
parser.add_option('--source-root')
@@ -364,9 +352,6 @@ def parse_args(args):
364352
cmd = fix_blas_resolving(args)
365353
cmd = fix_py2(cmd)
366354
cmd = remove_excessive_flags(cmd)
367-
if opts.musl:
368-
cmd = fix_cmd_for_musl(cmd)
369-
370355
cmd = fix_sanitize_flag(cmd, opts)
371356

372357
if opts.dynamic_cuda:

build/ymake.core.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,6 @@ module _BASE_UNIT: _BARE_UNIT {
770770
when ($MUSL == "yes") {
771771
CFLAGS += -D_musl_
772772
LINK_DYN_LIB_FLAGS += --musl
773-
LINK_SCRIPT_EXE_FLAGS += --musl
774773
PEERDIR+=contrib/libs/musl/include
775774
}
776775

0 commit comments

Comments
 (0)