Skip to content

Commit 9a97717

Browse files
committed
[gn] port be9c083 (CAS on-disk changes)
1 parent f8f7f1b commit 9a97717

File tree

4 files changed

+22
-4
lines changed

4 files changed

+22
-4
lines changed

llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ write_cmake_config("llvm-config") {
301301
"LLVM_BUILD_SHARED_LIBS=",
302302
"LLVM_ENABLE_LLVM_C_EXPORT_ANNOTATIONS=",
303303
"LLVM_ENABLE_TELEMETRY=",
304-
"LLVM_ENABLE_ONDISK_CAS=",
305304
"LLVM_DEFAULT_TARGET_TRIPLE=$llvm_target_triple",
306305
"LLVM_ENABLE_DEBUGLOC_TRACKING_COVERAGE=",
307306
"LLVM_ENABLE_DEBUGLOC_TRACKING_ORIGIN=",
@@ -367,6 +366,12 @@ write_cmake_config("llvm-config") {
367366
values += [ "LLVM_ENABLE_DIA_SDK=" ]
368367
}
369368

369+
if (llvm_enable_ondisk_cas) {
370+
values += [ "LLVM_ENABLE_ONDISK_CAS=1" ]
371+
} else {
372+
values += [ "LLVM_ENABLE_ONDISK_CAS=" ]
373+
}
374+
370375
if (llvm_enable_threads) {
371376
values += [ "LLVM_ENABLE_THREADS=1" ]
372377
} else {
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
declare_args() {
22
# Iterate unordered llvm containers in reverse.
33
llvm_enable_reverse_iteration = false
4+
5+
# Iterate unordered llvm containers in reverse.
6+
llvm_enable_ondisk_cas = false
47
}

llvm/utils/gn/secondary/llvm/lib/CAS/BUILD.gn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ static_library("CAS") {
1010
"ObjectStore.cpp",
1111
"OnDiskCommon.cpp",
1212
"OnDiskDataAllocator.cpp",
13+
"OnDiskGraphDB.cpp",
14+
"OnDiskKeyValueDB.cpp",
1315
"OnDiskTrieRawHashMap.cpp",
1416
]
1517
}

llvm/utils/gn/secondary/llvm/unittests/CAS/BUILD.gn

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import("//llvm/include/llvm/Config/config.gni")
12
import("//third-party/unittest/unittest.gni")
23

34
unittest("CASTests") {
@@ -10,8 +11,15 @@ unittest("CASTests") {
1011
"ActionCacheTest.cpp",
1112
"CASTestConfig.cpp",
1213
"ObjectStoreTest.cpp",
13-
"OnDiskDataAllocatorTest.cpp",
14-
"OnDiskTrieRawHashMapTest.cpp",
15-
"ProgramTest.cpp",
1614
]
15+
16+
if (llvm_enable_ondisk_cas) {
17+
sources += [
18+
"OnDiskDataAllocatorTest.cpp",
19+
"OnDiskGraphDBTest.cpp",
20+
"OnDiskKeyValueDBTest.cpp",
21+
"OnDiskTrieRawHashMapTest.cpp",
22+
"ProgramTest.cpp",
23+
]
24+
}
1725
}

0 commit comments

Comments
 (0)