set CC and CXX and their flags in meson #1098

xytan0056 · 2023-09-25T20:22:29Z

The PR sets CC and CXX in meson to the ones configured in bazel, instead of system's.
It also tries to merge and set CFLAGS, CXXFLAGS, LDFLAGS with implicit flags from bazel
refactoring split_arguments helper function to be more readable and able to process arguments with quotes

jsharpe · 2023-09-29T11:02:44Z

examples/third_party/mesa/BUILD.mesa.bazel

+    linkopts = select({
+        "@openssl//:msvc_compiler": [
+            "ws2_32.lib",
+        ],
+        "@platforms//os:linux": ["-lstdc++"],
+        # "@platforms//os:macos": ["-mlinker-version=305"],
+        "//conditions:default": [],
+    }),


I suspect the reason you're having to add these is because CXX is actually passing the c compiler because bazel by default passes -x c++ explicitly.

yes,
if we don't set CXX/CC, we get undefined symbol: fcntl64 with zig cc in our repo. However, setting them to bazel configured compiler, /usr/bin/gcc for both in CI here, we will need to pass in c++ library

jsharpe · 2023-09-29T11:03:21Z

examples/third_party/mesa/BUILD.mesa.bazel

+        "@openssl//:msvc_compiler": [
+            "ws2_32.lib",
+        ],
+        "@platforms//os:linux": ["-lstdc++"],


what if you're using libc++ via clang? this arg will break a libc++ build with clang.

by setting CXX and CC both compilers become /usr/bin/gcc, which is then used to compile cpp files in CI.
during linking with cpp file, it hits

undefined reference to `operator new

because of missing C++ support runtime library

added additional logic to not use lstdc++

linzhp

@jsharpe Can you take another look?

jheaff1 · 2023-10-14T16:39:24Z

foreign_cc/meson.bzl

@@ -201,3 +233,11 @@ def meson_with_requirements(name, requirements, **kwargs):
        toolchain = full_label("built_meson_toolchain_for_{}".format(name)),
        **kwargs
    )
+
+# TODO: converge with cmake_script.bzl


Is this TODO to be resolved as part of this PR?

just did another experiment, we can just use the same with

rules_foreign_cc/foreign_cc/private/cmake_script.bzl

Lines 313 to 316 in bae11c9

def _absolutize(workspace_name, text, force = False):

if text.strip(" ").startswith("C:") or text.strip(" ").startswith("c:"):

return text

return absolutize_path_in_str(workspace_name, "$EXT_BUILD_ROOT/", text, force)

updated

Update meson.bzl Update BUILD.mesa.bazel Update BUILD.mesa.bazel Update BUILD.mesa.bazel Update BUILD.bazel Update BUILD.bazel Update meson.bzl Update meson.bzl Update meson.bzl Update meson.bzl Update helpers.bzl Update helpers.bzl Update helpers.bzl Update helpers.bzl Update helpers.bzl Update helpers.bzl Update helpers.bzl Update meson.bzl Update helpers.bzl Update helpers.bzl lint comment Update meson.bzl Update meson.bzl Update meson.bzl Update meson.bzl debug Update meson.bzl Update meson.bzl Update CROSSTOOL Update CROSSTOOL

Update helpers.bzl Update helpers.bzl Update meson.bzl debug

Update BUILD.mesa.bazel Update BUILD.mesa.bazel Update meson.bzl Update BUILD.mesa.bazel Update BUILD.mesa.bazel Update BUILD.mesa.bazel Update BUILD.mesa.bazel m

this should work

xytan0056 · 2023-11-17T01:24:19Z

@jsharpe another look?

xytan0056 · 2023-12-11T09:33:58Z

@jsharpe

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_foreign_cc | bazel_dep | minor | `0.10.1` -> `0.11.1` | | [rules_foreign_cc](https://togithub.com/bazelbuild/rules_foreign_cc) | http_archive | patch | `0.11.0` -> `0.11.1` | --- ### Release Notes <details> <summary>bazelbuild/rules_foreign_cc (rules_foreign_cc)</summary> ### [`v0.11.1`](https://togithub.com/bazelbuild/rules_foreign_cc/releases/tag/0.11.1) [Compare Source](https://togithub.com/bazelbuild/rules_foreign_cc/compare/0.11.0...0.11.1) #### Using Bzlmod with Bazel 6 1. Enable with `common --enable_bzlmod` in `.bazelrc`. 2. Add to your `MODULE.bazel` file: ```starlark bazel_dep(name = "rules_foreign_cc", version = "0.11.1") ``` #### Using WORKSPACE Paste this snippet into your file: ```starlark load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_foreign_cc", sha256 = "4b33d62cf109bcccf286b30ed7121129cc34cf4f4ed9d8a11f38d9108f40ba74", strip_prefix = "rules_foreign_cc-0.11.1", url = "https://github.com/bazelbuild/rules_foreign_cc/releases/download/0.11.1/rules_foreign_cc-0.11.1.tar.gz", ) load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") ### This sets up some common toolchains for building targets. For more details, please see ### https://bazelbuild.github.io/rules_foreign_cc/0.11.1/flatten.html#rules_foreign_cc_dependencies rules_foreign_cc_dependencies() ``` **Full Changelog**: bazelbuild/rules_foreign_cc@0.10.1...0.11.1 #### What's Changed - Add missing sha256 for meson_src 1.1.1 by [@lalten](https://togithub.com/lalten) in [bazelbuild/rules_foreign_cc#1111 - Set an empty tools_data attribute for boost by [@attilaolah](https://togithub.com/attilaolah) in [bazelbuild/rules_foreign_cc#1112 - Advertise CcInfo provider by [@calebzulawski](https://togithub.com/calebzulawski) in [bazelbuild/rules_foreign_cc#1118 - Allow file targets in native_tool_toolchain() by [@sitaktif](https://togithub.com/sitaktif) in [bazelbuild/rules_foreign_cc#1117 - set CC and CXX and their flags in meson by [@xytan0056](https://togithub.com/xytan0056) in [bazelbuild/rules_foreign_cc#1098 - Turn off bzlmod in CI for now by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1142 - Fix `//openssl/...` by calling `openssl_setup()` by [@bcsgh](https://togithub.com/bcsgh) in [bazelbuild/rules_foreign_cc#1137 - Sort tests under examples/third_party and add zlib to the list. by [@bcsgh](https://togithub.com/bcsgh) in [bazelbuild/rules_foreign_cc#1136 - Use gazelle to generate bzl_library targets by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1127 - Use platform specific configs in bazelrc to reduce scope of settings by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1144 - Update to ubuntu 20.04 on RBE by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1145 - Remove explicit mention of bazel 4.x support by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1146 - Add mirrors to external repositories by [@mishazharov](https://togithub.com/mishazharov) in [bazelbuild/rules_foreign_cc#1153 - Build msvc cmake with prebuilt cmake by [@matt-sm](https://togithub.com/matt-sm) in [bazelbuild/rules_foreign_cc#1148 - Simplify the toolchain registration for bzlmod by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1105 - Update CMake versions by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1159 - Fix tool path for nmake by [@jsun-splunk](https://togithub.com/jsun-splunk) in [bazelbuild/rules_foreign_cc#1165 - chore(deps): Bump rules_apple. Fixes [#1156](https://togithub.com/bazelbuild/rules_foreign_cc/issues/1156) by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1166 - Add make 4.4.1 by [@novas0x2a](https://togithub.com/novas0x2a) in [bazelbuild/rules_foreign_cc#1167 - Increase resiliency of `runnable_binary` by [@mishazharov](https://togithub.com/mishazharov) in [bazelbuild/rules_foreign_cc#1134 - Fix windows examples CI by upgrading TLS trust store by [@mishazharov](https://togithub.com/mishazharov) in [bazelbuild/rules_foreign_cc#1171 - Fixes the CI failure at Bazel@HEAD by [@sgowroji](https://togithub.com/sgowroji) in [bazelbuild/rules_foreign_cc#1173 - Add j2objc fragment to rules by [@sgowroji](https://togithub.com/sgowroji) in [bazelbuild/rules_foreign_cc#1175 - Cater for different drive letters when normalizing path by [@matt-sm](https://togithub.com/matt-sm) in [bazelbuild/rules_foreign_cc#1169 - Fix [#1161](https://togithub.com/bazelbuild/rules_foreign_cc/issues/1161): set the `CMAKE` environment variables for prebuilt toolchains. by [@thb-sb](https://togithub.com/thb-sb) in [bazelbuild/rules_foreign_cc#1163 - Add aarch64 to prebuild library constraints for macos by [@dmeijboom](https://togithub.com/dmeijboom) in [bazelbuild/rules_foreign_cc#1176 - Use a sed delimiter that is unlikely to appear in the input by [@mkauf](https://togithub.com/mkauf) in [bazelbuild/rules_foreign_cc#1184 - Update rules_apple by [@sgowroji](https://togithub.com/sgowroji) in [bazelbuild/rules_foreign_cc#1190 - Fix - Copy Dir ignores hidden files on macOS by [@LaurenceTews](https://togithub.com/LaurenceTews) in [bazelbuild/rules_foreign_cc#1188 - fix(docs): Port docs generation to bzlmod to fix user facing doc generation by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1193 - Revert "fix(docs): Port docs generation to bzlmod to fix user facing doc generation" by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1194 - chore(deps): Add ninja 1.12.0 and latest versions of cmake by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1192 - adjust relative msvc paths by [@matt-sm](https://togithub.com/matt-sm) in [bazelbuild/rules_foreign_cc#1180 - Make pkgconfig Hermetic by [@dstufft](https://togithub.com/dstufft) in [bazelbuild/rules_foreign_cc#1069 - Exclude filenames with spaces from cmake toolchains by [@illicitonion](https://togithub.com/illicitonion) in [bazelbuild/rules_foreign_cc#1199 - fix: change cygpath to mixed mode by [@jsun-splunk](https://togithub.com/jsun-splunk) in [bazelbuild/rules_foreign_cc#1204 - fix: path expansion on windows by [@jsun-splunk](https://togithub.com/jsun-splunk) in [bazelbuild/rules_foreign_cc#1207 - Revert inadvertent direct commit to main by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1213 - Update framework.bzl to account for externalIncludes by [@layus](https://togithub.com/layus) in [bazelbuild/rules_foreign_cc#1215 - chore(deps): cmake/ninja: add new versions by [@novas0x2a](https://togithub.com/novas0x2a) in [bazelbuild/rules_foreign_cc#1212 - Revert "cmake: use variable expansion on generator args" by [@jsharpe](https://togithub.com/jsharpe) in [bazelbuild/rules_foreign_cc#1219 - Add in custom glib patch by [@andrewkatson](https://togithub.com/andrewkatson) in [bazelbuild/rules_foreign_cc#1211 #### New Contributors - [@lalten](https://togithub.com/lalten) made their first contribution in [bazelbuild/rules_foreign_cc#1111 - [@sitaktif](https://togithub.com/sitaktif) made their first contribution in [bazelbuild/rules_foreign_cc#1117 - [@mishazharov](https://togithub.com/mishazharov) made their first contribution in [bazelbuild/rules_foreign_cc#1153 - [@matt-sm](https://togithub.com/matt-sm) made their first contribution in [bazelbuild/rules_foreign_cc#1148 - [@jsun-splunk](https://togithub.com/jsun-splunk) made their first contribution in [bazelbuild/rules_foreign_cc#1165 - [@sgowroji](https://togithub.com/sgowroji) made their first contribution in [bazelbuild/rules_foreign_cc#1173 - [@thb-sb](https://togithub.com/thb-sb) made their first contribution in [bazelbuild/rules_foreign_cc#1163 - [@dmeijboom](https://togithub.com/dmeijboom) made their first contribution in [bazelbuild/rules_foreign_cc#1176 - [@mkauf](https://togithub.com/mkauf) made their first contribution in [bazelbuild/rules_foreign_cc#1184 - [@LaurenceTews](https://togithub.com/LaurenceTews) made their first contribution in [bazelbuild/rules_foreign_cc#1188 - [@layus](https://togithub.com/layus) made their first contribution in [bazelbuild/rules_foreign_cc#1215 - [@andrewkatson](https://togithub.com/andrewkatson) made their first contribution in [bazelbuild/rules_foreign_cc#1211 **Full Changelog**: bazelbuild/rules_foreign_cc@0.10.1...0.11.1 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/bazel-contrib/toolchains_llvm).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

xytan0056 marked this pull request as draft September 26, 2023 07:22

xytan0056 force-pushed the patch-1 branch from f44acea to 0a92c3f Compare September 27, 2023 20:26

jsharpe reviewed Sep 29, 2023

View reviewed changes

xytan0056 force-pushed the patch-1 branch 2 times, most recently from f1e112f to 1743036 Compare September 30, 2023 00:27

xytan0056 changed the title ~~set CFLAGS and CXXFLAGS in meson~~ set CC and CXX and their flags in meson Oct 13, 2023

xytan0056 marked this pull request as ready for review October 13, 2023 16:47

linzhp approved these changes Oct 13, 2023

View reviewed changes

jsharpe requested a review from jheaff1 October 14, 2023 15:15

jheaff1 reviewed Oct 14, 2023

View reviewed changes

jsharpe requested a review from jheaff1 November 10, 2023 10:28

jheaff1 approved these changes Nov 11, 2023

View reviewed changes

xytan0056 and others added 17 commits November 13, 2023 01:20

set CFLAGS and CXXFLAGS in meson

ce23570

update split_Args

379950d

Update helpers.bzl Update helpers.bzl Update meson.bzl debug

single quotes

b474fd7

list

15d613f

-std=c++14

4a309a7

Update BUILD.mesa.bazel Update BUILD.mesa.bazel Update meson.bzl Update BUILD.mesa.bazel Update BUILD.mesa.bazel Update BUILD.mesa.bazel Update BUILD.mesa.bazel m

xf

cedfbe1

rm print

9427c50

msvc

e9e3a8d

msvc c++11

c62c24a

rm lstdc++

f0ad69a

unit test

965705a

lint

7b9166a

Fix test

197e818

use bazel's flag

f5b3f0c

without copts

820f972

this should work

this should work:

8bb2503

Update meson.bzl

58f646b

xytan0056 force-pushed the patch-1 branch from 305f24f to 58f646b Compare November 13, 2023 09:20

jsharpe requested a review from jheaff1 December 6, 2023 00:04

jheaff1 approved these changes Dec 8, 2023

View reviewed changes

Merge branch 'bazelbuild:main' into patch-1

b68d878

jsharpe merged commit 51152aa into bazelbuild:main Dec 11, 2023
2 checks passed

xytan0056 deleted the patch-1 branch December 12, 2023 17:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

set CC and CXX and their flags in meson #1098

set CC and CXX and their flags in meson #1098

xytan0056 commented Sep 25, 2023 •

edited by jsharpe

Loading

jsharpe Sep 29, 2023

xytan0056 Sep 29, 2023 •

edited

Loading

jsharpe Sep 29, 2023

xytan0056 Sep 29, 2023

xytan0056 Oct 13, 2023

linzhp left a comment

jheaff1 Oct 14, 2023

xytan0056 Oct 15, 2023

xytan0056 commented Nov 17, 2023

xytan0056 commented Dec 11, 2023

	def _absolutize(workspace_name, text, force = False):
	if text.strip(" ").startswith("C:") or text.strip(" ").startswith("c:"):
	return text
	return absolutize_path_in_str(workspace_name, "$EXT_BUILD_ROOT/", text, force)

set CC and CXX and their flags in meson #1098

set CC and CXX and their flags in meson #1098

Conversation

xytan0056 commented Sep 25, 2023 • edited by jsharpe Loading

jsharpe Sep 29, 2023

Choose a reason for hiding this comment

xytan0056 Sep 29, 2023 • edited Loading

Choose a reason for hiding this comment

jsharpe Sep 29, 2023

Choose a reason for hiding this comment

xytan0056 Sep 29, 2023

Choose a reason for hiding this comment

xytan0056 Oct 13, 2023

Choose a reason for hiding this comment

linzhp left a comment

Choose a reason for hiding this comment

jheaff1 Oct 14, 2023

Choose a reason for hiding this comment

xytan0056 Oct 15, 2023

Choose a reason for hiding this comment

xytan0056 commented Nov 17, 2023

xytan0056 commented Dec 11, 2023

xytan0056 commented Sep 25, 2023 •

edited by jsharpe

Loading

xytan0056 Sep 29, 2023 •

edited

Loading