Skip to content

Commit 990bdae

Browse files
authored
Fix missed env vars for the 2-nd stage of the LLDB remote-linux builders. (#321)
Pass missed environment variables also into the 2-nd stage of the builds.
1 parent c2fe2ec commit 990bdae

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3293,6 +3293,18 @@
32933293
"-DCMAKE_CXX_FLAGS=-gmlt",
32943294
"-DLLVM_CCACHE_BUILD=ON"])},
32953295

3296+
]
3297+
3298+
# LLDB remote-linux builder env variables.
3299+
# Currently identical for Linux and Windows build hosts.
3300+
lldb_remote_linux_env = {
3301+
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
3302+
# TMP/TEMP within the build dir (to utilize a ramdisk).
3303+
'TMP' : util.Interpolate("%(prop:builddir)s/build"),
3304+
'TEMP' : util.Interpolate("%(prop:builddir)s/build"),
3305+
}
3306+
3307+
all += [
32963308
# LLDB remote-linux builders.
32973309

32983310
# LLDB remote-linux on Ubuntu Linux host.
@@ -3417,13 +3429,9 @@
34173429
haltOnFailure = True,
34183430
),
34193431
],
3420-
),
3421-
env = {
3422-
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
3423-
# TMP/TEMP within the build dir (to utilize a ramdisk).
3424-
'TMP' : util.Interpolate("%(prop:builddir)s/build"),
3425-
'TEMP' : util.Interpolate("%(prop:builddir)s/build"),
3426-
},
3432+
env = lldb_remote_linux_env.copy(),
3433+
), # ]] post_build_steps
3434+
env = lldb_remote_linux_env.copy(),
34273435
)
34283436
},
34293437

@@ -3548,13 +3556,9 @@
35483556
haltOnFailure = True,
35493557
),
35503558
],
3551-
),
3552-
env = {
3553-
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
3554-
# TMP/TEMP within the build dir (to utilize a ramdisk).
3555-
'TMP' : util.Interpolate("%(prop:builddir)s/build"),
3556-
'TEMP' : util.Interpolate("%(prop:builddir)s/build"),
3557-
},
3559+
env = lldb_remote_linux_env.copy(),
3560+
), # ]] post_build_steps
3561+
env = lldb_remote_linux_env.copy(),
35583562
)
35593563
},
35603564
]

0 commit comments

Comments
 (0)