Skip to content

Commit

Permalink
Added ppc64 (conan-io#669)
Browse files Browse the repository at this point in the history
  • Loading branch information
lasote authored and memsharded committed Nov 15, 2016
1 parent 14b513d commit f4ff6f1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion conans/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
from conans.util.files import load
import os

__version__ = '0.15.0'
__version__ = '0.16.0-dev'

2 changes: 1 addition & 1 deletion conans/client/conf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

default_settings_yml = """
os: [Windows, Linux, Macos, Android, iOS]
arch: [x86, x86_64, ppc64le, armv6, armv7, armv7hf, armv8]
arch: [x86, x86_64, ppc64le, ppc64, armv6, armv7, armv7hf, armv8]
compiler:
gcc:
version: ["4.4", "4.5", "4.6", "4.7", "4.8", "4.9", "5.1", "5.2", "5.3", "5.4", "6.1", "6.2"]
Expand Down
8 changes: 4 additions & 4 deletions conans/client/migrations.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ def _make_migrations(self, old_version):
if old_version is None:
return

if old_version < Version("0.12"):
if old_version < Version("0.16"):
old_settings = """
os: [Windows, Linux, Macos, Android, iOS]
arch: [x86, x86_64, armv6, armv7, armv7hf, armv8]
arch: [x86, x86_64, ppc64le, armv6, armv7, armv7hf, armv8]
compiler:
gcc:
version: ["4.4", "4.5", "4.6", "4.7", "4.8", "4.9", "5.1", "5.2", "5.3", "5.4", "6.1"]
version: ["4.4", "4.5", "4.6", "4.7", "4.8", "4.9", "5.1", "5.2", "5.3", "5.4", "6.1", "6.2"]
libcxx: [libstdc++, libstdc++11]
threads: [None, posix, win32] # Windows MinGW
exception: [None, dwarf2, sjlj, seh] # Windows MinGW
Visual Studio:
runtime: [MD, MT, MTd, MDd]
version: ["8", "9", "10", "11", "12", "14"]
clang:
version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8"]
version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
libcxx: [libstdc++, libstdc++11, libc++]
apple-clang:
version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0"]
Expand Down

0 comments on commit f4ff6f1

Please sign in to comment.