conan-io/conan#3603 (#845)

conan-io · Oct 8, 2018 · db62304 · db62304
1 parent ad17411
commit db62304
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/changelog.rst b/changelog.rst
@@ -34,6 +34,9 @@ Check https://github.com/conan-io/conan for issues and more details about develo
   by default.
 - Feature: ``tools.vcvars_command()`` helper will use latest Microsoft Visual Studio version available on machine for compilers other than Visual Studio (e.g. clang-cl).
 - Feature: Added a new ``tools.latest_visual_studio_version_installed()`` method.
+- Fix: More complete architecture list in the detection of the gnu triplet and the detection of the build machine architecture.
+- Bugfix: Renamed ``os`` (reserved symbol) parameter to ``os_`` in the ``get_gnu_triplet`` tool.
+- Bugfix: Warning message printed if Conan cannot deduce an architecture of a GNU triplet.
 
 
 1.7.4 (18-September-2018)

diff --git a/reference/tools.rst b/reference/tools.rst
@@ -728,12 +728,12 @@ tools.get_gnu_triplet()
 
 .. code-block:: python
 
-    def get_gnu_triplet(os, arch, compiler=None)
+    def get_gnu_triplet(os_, arch, compiler=None)
 
 Returns string with GNU like ``<machine>-<vendor>-<op_system>`` triplet.
 
 Parameters:
-    - **os** (Required): Operating system to be used to create the triplet.
+    - **os_** (Required): Operating system to be used to create the triplet.
     - **arch** (Required): Architecture to be used to create the triplet.
     - **compiler** (Optional, Defaulted to ``None``): Compiler used to create the triplet (only needed for Windows).