Browse Source

Remove unused logic regarding $_LD_SYS_LIB
commit_hash:958858f47fc6d27888ccfcbdaf2612e7c65d8f96

thegeorg 2 months ago
parent
commit
52564b20aa
2 changed files with 2 additions and 10 deletions
  1. 2 2
      build/conf/linkers/ld.conf
  2. 0 8
      build/ymake_conf.py

+ 2 - 2
build/conf/linkers/ld.conf

@@ -105,7 +105,7 @@ elsewhen ($OS_LINUX == "yes" || $OS_DARWIN == "yes" || $OS_IOS == "yes") {
     _LD_USE_STDLIB=-nodefaultlibs
 }
 
-_C_SYSTEM_LIBRARIES=$_LD_USE_STDLIB $_LD_THREAD_LIBRARY $_LD_SYS_LIB -lc
+_C_SYSTEM_LIBRARIES=$_LD_USE_STDLIB $_LD_THREAD_LIBRARY -lc
 when ($MUSL == "yes") {
     _C_SYSTEM_LIBRARIES=-nostdlib
 }
@@ -171,7 +171,7 @@ when ($OS_EMSCRIPTEN == "yes") {
 }
 _SHARED_FLAG=-shared
 when ($OS_EMSCRIPTEN == "yes") {
-    _SHARED_FLAG=-Wl,-shared -Wl,--no-entry -Wl,--export-all -Wl,--import-memory -Wl,--import-undefined 
+    _SHARED_FLAG=-Wl,-shared -Wl,--no-entry -Wl,--export-all -Wl,--import-memory -Wl,--import-undefined
 }
 _EXEC_SHARED_FLAG=
 when ($OS_LINUX == "yes") {

+ 0 - 8
build/ymake_conf.py

@@ -1070,11 +1070,6 @@ class GnuToolchainOptions(ToolchainOptions):
 
         self.dwarf_tool = self.target.find_in_dict(self.params.get('dwarf_tool'))
 
-        # TODO(somov): Унифицировать формат sys_lib
-        self.sys_lib = self.params.get('sys_lib', {})
-        if isinstance(self.sys_lib, dict):
-            self.sys_lib = self.target.find_in_dict(self.sys_lib, [])
-
         self.os_sdk = preset('OS_SDK') or self._default_os_sdk()
 
         self.os_sdk_local = False
@@ -1718,8 +1713,6 @@ class LD(Linker):
         if self.ld_sdk:
             self.ld_flags.append(self.ld_sdk)
 
-        self.sys_lib = self.tc.sys_lib
-
         if target.is_android:
             # Use toolchain defaults to link with libunwind/clang_rt.builtins
             self.use_stdlib = '-nostdlib++'
@@ -1737,7 +1730,6 @@ class LD(Linker):
         emit('OBJDUMP_TOOL_VENDOR', self.objdump)
 
         emit('_LD_FLAGS', self.ld_flags)
-        emit('_LD_SYS_LIB', self.sys_lib)
         emit('LD_SDK_VERSION', self.ld_sdk)
 
         dwarf_tool = self.tc.dwarf_tool