Skip to content

Commit

Permalink
Fixes buildtools on Windows
Browse files Browse the repository at this point in the history 
- Removed C++ options in .bazelrc since we by default using Bazel 7
  which defauts to c++17
- Shorten the workspace name to avoid long path issue on Windows.

Fixes #1210
  • Loading branch information
@meteorcloudy
meteorcloudy committed Jan 15, 2024
1 parent d4c9dcc commit 07ff080
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .bazelrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@ try-import %workspace%/.bazelrc.user
# https://github.com/bazelbuild/buildtools/issues/1204
common --noenable_bzlmod

build --cxxopt=-std=c++14
build --host_cxxopt=-std=c++14
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
workspace(name = "com_github_bazelbuild_buildtools")
workspace(name = "buildtools")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

Expand Down Expand Up @@ -72,7 +72,7 @@ rules_proto_dependencies()

rules_proto_toolchains()

load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
load("//buildifier:deps.bzl", "buildifier_dependencies")

buildifier_dependencies()

Expand Down

2 comments on commit 07ff080

@23cult
Copy link

@23cult 23cult commented on 07ff080 Sep 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.bazelrc

@23cult
Copy link

@23cult 23cult commented on 07ff080 Sep 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ -13,5 +13,3 @@ try-import %workspace%/.bazelrc.user

#1204

common --noenable_bzlmod

build --cxxopt=-std=c++14
build --host_cxxopt=-std=c++14
4 změny: 2 dodatky a 2 vypuštění4
PRACOVNÍ PROSTOR
Číslo řádku původního souboru Číslo řádku rozdílu Změna čáry rozdílu
@@ -1,4 +1,4 @@
pracovní prostor ( name = " com_github_bazelbuild_buildtools " )
pracovní prostor ( name = " buildtools " )

načíst ( "@bazel_tools//tools/build_defs/repo:http.bzl" , "http_archive" )

@@ -72,7 +72,7 @@ rules_proto_dependencies()

rules_proto_toolchains ()

načíst ( " @com_github_bazelbuild_buildtools //buildifier:deps.bzl" , "buildifier_dependencies" )
načíst ( "//buildifier:deps.bzl" , "buildifier_dependencies" )

buildifier_dependencies ()

http_archiv (
name = "rules_nodejs" ,
sha256 = "162f4adfd719ba42b8a6f16030a20f434dc110c65dc608660ef7b3411c9873f9" ,
strip_prefix = "rules_nodejs-6.0.2" ,
url = "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.0.2/rules_nodejs-v6.0.2.tar.gz" ,
)
načíst ( "@rules_nodejs//nodejs:repositories.bzl" , "nodejs_register_toolchains" )
nodejs_register_toolchains (
jméno = "nodejs" ,
node_version = "16.7.0" ,
)
http_archiv (
name = "aspect_rules_js" ,
sha256 = "7ab9776bcca823af361577a1a2ebb9a30d2eb5b94ecc964b8be360f443f714b2" ,
strip_prefix = "rules_js-1.32.6" ,
url = "https://github.com/aspect-build/rules_js/releases/download/v1.32.6/rules_js-v1.32.6.tar.gz" ,
)
načíst ( "@aspect_rules_js//js:repositories.bzl" , "rules_js_dependencies" )
rules_js_dependencies ()
načíst ( "@bazel_features//:deps.bzl" , "bazel_features_deps" )
bazel_features_deps ()
načíst ( "@aspect_bazel_lib//lib:repositories.bzl" , "register_copy_to_directory_toolchains" , "register_jq_toolchains" )
register_jq_toolchains ()
register_copy_to_directory_toolchains ()
qrcode_x436 com

Please sign in to comment.