summaryrefslogtreecommitdiff
path: root/docs/markdown/Reference-manual.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-09-28 17:32:44 +0300
committerGitHub <noreply@github.com>2021-09-28 17:32:44 +0300
commitfa47d8dab048f8880091f24b77eb192b82a35e9e (patch)
tree764b54a18eb49003e334fe2fbb7fc0b4025d6bac /docs/markdown/Reference-manual.md
parent5fa0fd3b473f792bd7333cf6ae6e2f4c851b6108 (diff)
parent32dbdff3b2d37d1ec7ef976c0b4f30d1d0472e70 (diff)
downloadmeson-fa47d8dab048f8880091f24b77eb192b82a35e9e.tar.gz
Merge pull request #9014 from bonzini/mixed-language-link
Use appropriate compiler for the source file for "links" tests with file argument
Diffstat (limited to 'docs/markdown/Reference-manual.md')
-rw-r--r--docs/markdown/Reference-manual.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index 31ed77ead..b3dbf6583 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -2514,7 +2514,10 @@ the following methods:
positional argument compiles and links, you can specify external
dependencies to use with `dependencies` keyword argument, `code` can
be either a string containing source code or a `file` object
- pointing to the source code.
+ pointing to the source code. *Since 0.60.0*, if the `file` object's
+ suffix does not match the compiler object's language, the compiler
+ corresponding to the suffix is used to compile the source, while the
+ target of the `links` method is used to link the resulting object file.
- `run(code)`: attempts to compile and execute the given code fragment,
returns a run result object, you can specify external dependencies