Skip to content

Commit 89a3503

Browse files
committed
pkg/build: use relative path for fx set directory arg
1 parent deb7287 commit 89a3503

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/build/starnix.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ func (st starnix) build(params Params) (ImageDetails, error) {
5959
if err := osutil.SandboxChown(localDir); err != nil {
6060
return ImageDetails{}, err
6161
}
62-
buildDir := filepath.Join(params.KernelDir, "out/"+arch)
62+
buildSubdir := "out/" + arch
6363
if _, err := runSandboxed(
6464
time.Hour,
6565
params.KernelDir,
66-
"scripts/fx", "--dir", buildDir,
66+
"scripts/fx", "--dir", buildSubdir,
6767
"set", product,
6868
"--assembly-override", fmt.Sprintf("//products/workbench/*=//local:%s", overrideName),
6969
); err != nil {
@@ -82,7 +82,7 @@ func (st starnix) build(params Params) (ImageDetails, error) {
8282
params.KernelDir,
8383
ffxBinary,
8484
"--no-environment",
85-
"-c", filepath.Join(buildDir, ffxBuildConfig),
85+
"-c", filepath.Join(params.KernelDir, buildSubdir, ffxBuildConfig),
8686
"-c", "log.enabled=false,ffx.analytics.disabled=true,daemon.autostart=false",
8787
"config", "get", "product.path",
8888
)

0 commit comments

Comments
 (0)