aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-03-18 20:06:47 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-03-18 20:50:53 +0300
commit693fac488e3b7a0c87befe82ef47947dbf5c3f91 (patch)
treed258d8dbd068dc30d06e92ad2febd91e1978f4a5
parent6a266f4c8ba6cbf8f1e55fc9dd82bbdecdbf1735 (diff)
downloadydb-693fac488e3b7a0c87befe82ef47947dbf5c3f91.tar.gz
Stop using prebuilt flatc compiler
acaad63ae411eabba0db4fc630aa65a1ba9ee1db
-rw-r--r--build/prebuilt/contrib/tools/flatc/resources.json19
-rw-r--r--build/prebuilt/contrib/tools/flatc/ya.make7
-rw-r--r--build/prebuilt/contrib/tools/flatc/ya.make.induced_deps4
-rw-r--r--build/prebuilt/contrib/tools/flatc/ya.make.prebuilt15
-rw-r--r--contrib/tools/flatc/bin/ya.make23
-rw-r--r--contrib/tools/flatc/ya.make32
6 files changed, 24 insertions, 76 deletions
diff --git a/build/prebuilt/contrib/tools/flatc/resources.json b/build/prebuilt/contrib/tools/flatc/resources.json
deleted file mode 100644
index 24c205107d..0000000000
--- a/build/prebuilt/contrib/tools/flatc/resources.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "by_platform": {
- "darwin": {
- "uri": "sbr:5983041213"
- },
- "darwin-arm64": {
- "uri": "sbr:5983040151"
- },
- "linux": {
- "uri": "sbr:5983042955"
- },
- "linux-aarch64": {
- "uri": "sbr:5983042153"
- },
- "win32-clang-cl": {
- "uri": "sbr:5983038870"
- }
- }
-}
diff --git a/build/prebuilt/contrib/tools/flatc/ya.make b/build/prebuilt/contrib/tools/flatc/ya.make
deleted file mode 100644
index b8bf0fa869..0000000000
--- a/build/prebuilt/contrib/tools/flatc/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-OWNER(g:ymake)
-
-INCLUDE(ya.make.prebuilt)
-
-IF (NOT PREBUILT)
- MESSAGE(FATAL_ERROR Unsupported host platform for prebuilt flatc tool)
-ENDIF()
diff --git a/build/prebuilt/contrib/tools/flatc/ya.make.induced_deps b/build/prebuilt/contrib/tools/flatc/ya.make.induced_deps
deleted file mode 100644
index 9dbdb62e07..0000000000
--- a/build/prebuilt/contrib/tools/flatc/ya.make.induced_deps
+++ /dev/null
@@ -1,4 +0,0 @@
-INDUCED_DEPS(h
- ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers.h
- ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers_iter.h
-)
diff --git a/build/prebuilt/contrib/tools/flatc/ya.make.prebuilt b/build/prebuilt/contrib/tools/flatc/ya.make.prebuilt
deleted file mode 100644
index fe93f102a9..0000000000
--- a/build/prebuilt/contrib/tools/flatc/ya.make.prebuilt
+++ /dev/null
@@ -1,15 +0,0 @@
-SET_RESOURCE_URI_FROM_JSON(SANDBOX_RESOURCE_URI ${ARCADIA_ROOT}/build/prebuilt/contrib/tools/flatc/resources.json)
-
-IF (SANDBOX_RESOURCE_URI != "")
- ENABLE(PREBUILT)
-
- PREBUILT_PROGRAM()
-
- DECLARE_EXTERNAL_RESOURCE(FLATC ${SANDBOX_RESOURCE_URI})
-
- PRIMARY_OUTPUT(${FLATC_RESOURCE_GLOBAL}/flatc${MODULE_SUFFIX})
-
- INCLUDE(ya.make.induced_deps)
-
- END()
-ENDIF()
diff --git a/contrib/tools/flatc/bin/ya.make b/contrib/tools/flatc/bin/ya.make
deleted file mode 100644
index f94d2e6aa2..0000000000
--- a/contrib/tools/flatc/bin/ya.make
+++ /dev/null
@@ -1,23 +0,0 @@
-PROGRAM(flatc)
-
-NO_UTIL()
-
-ADDINCL(
- contrib/libs/flatbuffers/include
-)
-
-PEERDIR(
- contrib/libs/flatbuffers/flatc
-)
-
-SRCDIR(
- contrib/libs/flatbuffers/src
-)
-
-SRCS(
- flatc_main.cpp
-)
-
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/flatc/ya.make.induced_deps)
-
-END()
diff --git a/contrib/tools/flatc/ya.make b/contrib/tools/flatc/ya.make
index 93e5104a93..d7d57f05a9 100644
--- a/contrib/tools/flatc/ya.make
+++ b/contrib/tools/flatc/ya.make
@@ -1,11 +1,27 @@
-IF (USE_PREBUILT_TOOLS)
- INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/flatc/ya.make.prebuilt)
-ENDIF()
+PROGRAM(flatc)
-IF (NOT PREBUILT)
- INCLUDE(${ARCADIA_ROOT}/contrib/tools/flatc/bin/ya.make)
-ENDIF()
+INDUCED_DEPS(
+ h
+ ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers.h
+ ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers_iter.h
+)
+
+NO_UTIL()
-RECURSE(
- bin
+ADDINCL(
+ contrib/libs/flatbuffers/include
)
+
+PEERDIR(
+ contrib/libs/flatbuffers/flatc
+)
+
+SRCDIR(
+ contrib/libs/flatbuffers/src
+)
+
+SRCS(
+ flatc_main.cpp
+)
+
+END()