diff options
| author | dmfedin <dmfedin@yandex-team.com> | 2023-11-02 22:19:02 +0300 |
|---|---|---|
| committer | dmfedin <dmfedin@yandex-team.com> | 2023-11-02 22:45:32 +0300 |
| commit | dab4e7eff56df570d1174a06824539de1e64d22c (patch) | |
| tree | 802add636f22063f33d6d633ea79a71facbbc300 /build | |
| parent | 16ebc933ab60f4738ec54a12255fb512be238ebf (diff) | |
| download | ydb-dab4e7eff56df570d1174a06824539de1e64d22c.tar.gz | |
Fix sdk root path for ios builds
Diffstat (limited to 'build')
| -rwxr-xr-x | build/ymake_conf.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 11cf2af7f7..d9cf1ebc6d 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -1289,10 +1289,10 @@ class GnuToolchain(Toolchain): if self.tc.is_from_arcadia or self.tc.is_system_cxx: if target.is_apple: if target.is_ios: - self.setup_sdk(project='build/platform/ios_sdk', var='${IOS_SDK_ROOT_RESOURCE_GLOBAL}') + self.setup_xcode_sdk(project='build/platform/ios_sdk', var='${IOS_SDK_ROOT_RESOURCE_GLOBAL}') self.platform_projects.append('build/platform/macos_system_stl') if target.is_macos: - self.setup_sdk(project='build/platform/macos_sdk', var='${MACOS_SDK_RESOURCE_GLOBAL}') + self.setup_xcode_sdk(project='build/platform/macos_sdk', var='${MACOS_SDK_RESOURCE_GLOBAL}') self.platform_projects.append('build/platform/macos_system_stl') if target.is_linux: @@ -1315,10 +1315,10 @@ class GnuToolchain(Toolchain): if target.is_apple: if not tc.os_sdk_local: if target.is_ios: - self.setup_sdk(project='build/platform/ios_sdk', var='${IOS_SDK_ROOT_RESOURCE_GLOBAL}') + self.setup_xcode_sdk(project='build/platform/ios_sdk', var='${IOS_SDK_ROOT_RESOURCE_GLOBAL}') self.platform_projects.append('build/platform/macos_system_stl') if target.is_macos: - self.setup_sdk(project='build/platform/macos_sdk', var='${MACOS_SDK_RESOURCE_GLOBAL}') + self.setup_xcode_sdk(project='build/platform/macos_sdk', var='${MACOS_SDK_RESOURCE_GLOBAL}') self.platform_projects.append('build/platform/macos_system_stl') else: if target.is_iossim: @@ -1333,6 +1333,12 @@ class GnuToolchain(Toolchain): self.c_flags_platform.append('--sysroot={}'.format(var)) self.swift_flags_platform += ['-sdk', var] + def setup_xcode_sdk(self, project, var): + self.platform_projects.append(project) + self.c_flags_platform.append('-isysroot') + self.c_flags_platform.append(var) + self.swift_flags_platform += ['-sdk', var] + # noinspection PyShadowingBuiltins def setup_tools(self, project, var, bin, ldlibs): self.platform_projects.append(project) |