aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf/sysincl.conf
diff options
context:
space:
mode:
authorAlexander Smirnov <alex@ydb.tech>2024-07-08 15:54:05 +0000
committerAlexander Smirnov <alex@ydb.tech>2024-07-08 15:54:05 +0000
commitfc7be18c76af2e700641f3598c4856baeef1428e (patch)
tree11dbca45eb321c3a4dd08b12152acc6ef5dd3fa9 /build/conf/sysincl.conf
parentec0e7ed6da6fb317741fd8468602949a1362eca5 (diff)
parentc92cb9d3a19331916f0c274d80e67f02a62caa9b (diff)
downloadydb-fc7be18c76af2e700641f3598c4856baeef1428e.tar.gz
Merge branch 'rightlib' into mergelibs-240708-1553
Diffstat (limited to 'build/conf/sysincl.conf')
-rw-r--r--build/conf/sysincl.conf10
1 files changed, 8 insertions, 2 deletions
diff --git a/build/conf/sysincl.conf b/build/conf/sysincl.conf
index df7be6ea38..9690109420 100644
--- a/build/conf/sysincl.conf
+++ b/build/conf/sysincl.conf
@@ -35,11 +35,17 @@ otherwise {
}
when ($USE_SYSTEM_JDK) {
- SYSINCL+=build/sysincl/system-jdk.yml
+ SYSINCL+=build/sysincl/jdk-to-system.yml
+}
+otherwise {
+ SYSINCL+=build/sysincl/jdk-to-arcadia.yml
}
when ($OPENSOURCE == "yes") {
- SYSINCL += build/sysincl/opensource.yml
+ SYSINCL+=build/sysincl/opensource.yml
+}
+otherwise {
+ SYSINCL+=build/sysincl/proto.yml
}
when ($MUSL == "yes") {