diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-06-03 08:43:13 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-06-03 08:43:13 +0000 |
| commit | e8b793b8275c229a46b4211f83c03cb074c9ba7c (patch) | |
| tree | 831d4507c2b234635f45b573fcd03a4b96133bb5 /build/internal | |
| parent | 89c3654dc08129116422f621b50086305f68bc9c (diff) | |
| parent | 28ff234f758e7fd2f42f229a4b55ff70506f0015 (diff) | |
| download | ydb-e8b793b8275c229a46b4211f83c03cb074c9ba7c.tar.gz | |
Merge branch 'rightlib' into mergelibs-240603-0842
Diffstat (limited to 'build/internal')
| -rw-r--r-- | build/internal/platform/macos_sdk/ya.make | 5 | ||||
| -rw-r--r-- | build/internal/platform/macos_system_stl/ya.make | 13 |
2 files changed, 3 insertions, 15 deletions
diff --git a/build/internal/platform/macos_sdk/ya.make b/build/internal/platform/macos_sdk/ya.make index 283c95430a..f80ecb6677 100644 --- a/build/internal/platform/macos_sdk/ya.make +++ b/build/internal/platform/macos_sdk/ya.make @@ -1,13 +1,14 @@ RESOURCES_LIBRARY() -# macOS 11.1 Big Sur SDK / Xcode 12.4 (12D4e) -DECLARE_EXTERNAL_RESOURCE(MACOS_SDK sbr:2088833948) +# macOS 14.2 Sonoma SDK / Xcode 15.1 (15C65) +DECLARE_EXTERNAL_RESOURCE(MACOS_SDK sbr:6121515192) IF (USE_STL_SYSTEM) SET(__XCODE_RESOURCE_NAME CPP_XCODE_TOOLCHAIN_ROOT) SET(__XCODE_TOOLCHAIN_VERSION ${CPP_XCODE_TOOLCHAIN_VERSION}) INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/ya.make.inc) CFLAGS( + GLOBAL -isystem$MACOS_SDK_RESOURCE_GLOBAL/usr/include/c++/v1 GLOBAL -F$MACOS_SDK_RESOURCE_GLOBAL/System/Library/Frameworks ) LDFLAGS( diff --git a/build/internal/platform/macos_system_stl/ya.make b/build/internal/platform/macos_system_stl/ya.make deleted file mode 100644 index 1659a184ba..0000000000 --- a/build/internal/platform/macos_system_stl/ya.make +++ /dev/null @@ -1,13 +0,0 @@ -RESOURCES_LIBRARY() - -# Taken from the default toolchain of the Xcode 12.5.1 -DECLARE_EXTERNAL_RESOURCE(MACOS_SYSTEM_STL sbr:2561940097) - -# xcode toolchain allready contains system headers -IF (USE_STL_SYSTEM AND NOT XCODE) - CFLAGS( - GLOBAL -I${MACOS_SYSTEM_STL_RESOURCE_GLOBAL}/include - ) -ENDIF() - -END() |