aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-09 22:55:08 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 15:58:17 +0300
commit7933065354717ed4ec1ad84120c0eafce5fc1692 (patch)
tree3ae388cf8fa1541ca3fb22d815d0352be859618a
parent0830448769cbfaf4d68b901433d786d0be99fe00 (diff)
downloadydb-7933065354717ed4ec1ad84120c0eafce5fc1692.tar.gz
intermediate changes
ref:cea85abc830c38d1a39f368e2e60438d5a2785ba
-rw-r--r--build/scripts/process_whole_archive_option.py2
-rw-r--r--build/ya.conf.json10
-rw-r--r--library/cpp/uri/assign.cpp1
-rw-r--r--library/cpp/uri/encode.cpp1
-rw-r--r--library/cpp/uri/uri.cpp2
5 files changed, 11 insertions, 5 deletions
diff --git a/build/scripts/process_whole_archive_option.py b/build/scripts/process_whole_archive_option.py
index 85605074a50..a9c4ef676aa 100644
--- a/build/scripts/process_whole_archive_option.py
+++ b/build/scripts/process_whole_archive_option.py
@@ -142,7 +142,7 @@ class ProcessWholeArchiveOption():
return cmd
def construct_cmd(self, args):
- if self.arch in ('DARWIN', 'IOS'):
+ if self.arch in ('DARWIN', 'IOS', 'IOSSIM'):
return self._construct_cmd_apple(args)
if self.arch == 'WINDOWS':
diff --git a/build/ya.conf.json b/build/ya.conf.json
index 64d278fc271..56d26de121e 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -2036,6 +2036,16 @@
"arch": "arm64"
},
"default": false
+ },
+ {
+ "host": {
+ "os": "DARWIN"
+ },
+ "target": {
+ "os": "IOSSIM",
+ "arch": "arm64"
+ },
+ "default": false
}
],
"params": {
diff --git a/library/cpp/uri/assign.cpp b/library/cpp/uri/assign.cpp
index ea1955a9e92..ae9125c7274 100644
--- a/library/cpp/uri/assign.cpp
+++ b/library/cpp/uri/assign.cpp
@@ -7,7 +7,6 @@
#include <util/charset/wide.h>
#include <util/memory/tempbuf.h>
#include <util/string/cast.h>
-#include <util/system/maxlen.h>
#include <util/system/yassert.h>
#include <util/system/sys_alloc.h>
diff --git a/library/cpp/uri/encode.cpp b/library/cpp/uri/encode.cpp
index 9eab1535bc6..584fb1bac99 100644
--- a/library/cpp/uri/encode.cpp
+++ b/library/cpp/uri/encode.cpp
@@ -1,6 +1,5 @@
#include "encode.h"
-#include <util/string/cast.h>
#include <util/generic/singleton.h>
namespace NUri {
diff --git a/library/cpp/uri/uri.cpp b/library/cpp/uri/uri.cpp
index 1664e8c8ddf..56a9a4e5ef4 100644
--- a/library/cpp/uri/uri.cpp
+++ b/library/cpp/uri/uri.cpp
@@ -3,9 +3,7 @@
#include <util/string/cast.h>
#include <util/string/util.h>
-#include <util/system/maxlen.h>
#include <util/system/yassert.h>
-#include <util/generic/map.h>
namespace NUri {
TState::EParsed TUri::CheckHost(const TStringBuf& host) {