Skip to content

Commit 73df4fa

Browse files
committed
Go: fix Windows installation
1 parent 5b184c1 commit 73df4fa

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.bazelrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ build:macos --cxxopt=-std=c++20 --cpu=darwin_x86_64
1515
build:windows --cxxopt=/std:c++20 --cxxopt=/Zc:preprocessor
1616

1717
# this requires developer mode, but is required to have pack installer functioning
18-
common:windows --windows_enable_symlinks --enable_runfiles
18+
startup --windows_enable_symlinks
19+
common --enable_runfiles
1920

2021
common --registry=file:///%workspace%/misc/bazel/registry
2122
common --registry=https://bcr.bazel.build

go/create_extractor_pack.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@
1313

1414
from go._extractor_pack_install_script import main
1515

16-
if os.environ['REPO_NAME'] == 'codeql~':
16+
build_dir = workspace_dir / 'go' / 'build'
17+
18+
if not build_dir.exists():
19+
# we probably are in the internal repo
1720
workspace_dir /= 'ql'
21+
build_dir = workspace_dir / 'go' / 'build'
1822

19-
dest_dir = workspace_dir / 'go' / 'build' / 'codeql-extractor-pack'
23+
dest_dir = build_dir / 'codeql-extractor-pack'
2024
shutil.rmtree(dest_dir, ignore_errors=True)
2125
os.environ['DESTDIR'] = str(dest_dir)
2226
main(sys.argv)

0 commit comments

Comments
 (0)