Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

intel-cc cppstd=03 failed #13844

Merged
merged 1 commit into from
May 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conans/client/conf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
update: [null, ANY]
mode: ["icx", "classic", "dpcpp"]
libcxx: [null, libstdc++, libstdc++11, libc++]
cppstd: [null, 98, gnu98, 03, gnu03, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
cppstd: [null, 98, gnu98, "03", gnu03, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
runtime: [null, static, dynamic]
runtime_type: [null, Debug, Release]
qcc:
Expand All @@ -128,4 +128,4 @@ def migrate_settings_file(cache):
from conans.client.migrations import update_file

settings_path = cache.settings_path
update_file(settings_path, get_default_settings_yml())
update_file(settings_path, default_settings_yml)
4 changes: 2 additions & 2 deletions conans/client/conf/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ def _detected_architecture():


def _detect_os_arch(result):
from conans.client.conf import get_default_settings_yml
from conans.client.conf import default_settings_yml
from conans.model.settings import Settings

the_os = platform.system()
Expand All @@ -346,7 +346,7 @@ def _detect_os_arch(result):

if arch:
if arch.startswith('arm'):
settings = Settings.loads(get_default_settings_yml())
settings = Settings.loads(default_settings_yml)
defined_architectures = settings.arch.values_range
defined_arm_architectures = [v for v in defined_architectures if v.startswith("arm")]

Expand Down
7 changes: 7 additions & 0 deletions conans/test/unittests/model/settings_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,3 +436,10 @@ def test_rm_safe():
with pytest.raises(Exception) as e:
settings.compiler.libcxx = "libstdc++"
assert "'settings.compiler.libcxx' doesn't exist for 'clang'" in str(e.value)


def test_settings_intel_cppstd_03():
settings = Settings.loads(default_settings_yml)
settings.compiler = "intel-cc"
# This doesn't crash, it used to crash due to "03" not quoted in setting.yml
settings.compiler.cppstd = "03"