diff options
| -rw-r--r-- | build/conf/linkers/ld.conf | 4 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index df576648f3d..b189bf1e179 100644 --- a/build/conf/linkers/ld.conf +++ b/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") { diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 1ab3e1cd215..83a8fc726e3 100755 --- a/build/ymake_conf.py +++ b/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 |