Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
xytan0056 committed Sep 27, 2023
1 parent 8f69bbf commit 0a92c3f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion examples/third_party/mesa/BUILD.mesa.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,14 @@ meson_with_requirements(
"PATH": "$$(dirname $$EXT_BUILD_ROOT$$/$(location @bison//:gen_dir))/bison/bin:$$(dirname $$EXT_BUILD_ROOT$$/$(location @flex//:flex_exe)):$$EXT_BUILD_DEPS$$/bin/m4/bin/:$$(dirname $$EXT_BUILD_ROOT$$/$(PYTHON3)):$$PATH",
},
}),
linkopts = ["-lstdc++"],
lib_source = ":all_srcs",
linkopts = select({
"@openssl//:msvc_compiler": [
"ws2_32.lib",
],
"@platforms//os:linux": ["-lstdc++"],
"//conditions:default": [],
}),
options = select({
"@platforms//os:linux": {
# Disable LLVM support, as building LLVM in rules_foreign_cc CI would drastically increase the build time
Expand Down
4 changes: 2 additions & 2 deletions foreign_cc/meson.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

load("//foreign_cc:utils.bzl", "full_label")
load("//foreign_cc/built_tools:meson_build.bzl", "meson_tool")
load("//foreign_cc/private:cc_toolchain_util.bzl", "get_tools_info", "absolutize_path_in_str")
load("//foreign_cc/private:cc_toolchain_util.bzl", "absolutize_path_in_str", "get_tools_info")
load(
"//foreign_cc/private:detect_root.bzl",
"detect_root",
Expand Down Expand Up @@ -64,7 +64,7 @@ def _create_meson_script(configureParameters):

tools = get_tools_info(ctx)
script = pkgconfig_script(inputs.ext_build_dirs)

# CFLAGS and CXXFLAGS are also set in foreign_cc/private/cmake_script.bzl
# They are split by meson on whitespace, but for Windows it's common to have spaces in path
# https://github.com/mesonbuild/meson/issues/3565
Expand Down

0 comments on commit 0a92c3f

Please sign in to comment.