diff --git a/.pick_status.json b/.pick_status.json index 74da9c55b73..320ae4bef07 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6284,7 +6284,7 @@ "description": "meson: remove intel-clc options", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "f0e18c475b71c7804e893ab7c1b70bb548ee6917", "notes": null diff --git a/meson.options b/meson.options index c3c02c4c94f..23927927043 100644 --- a/meson.options +++ b/meson.options @@ -679,24 +679,6 @@ option( description : 'Build vulkan drivers with BETA extensions enabled.' ) -option( - 'intel-clc', - type : 'combo', - deprecated: {'true': 'enabled'}, - value : 'auto', - choices : [ - 'enabled', 'system', 'auto' - ], - description : 'Build the intel-clc compiler or use a system version.' -) - -option( - 'install-intel-clc', - type : 'boolean', - value : false, - description : 'Install the intel-clc compiler (if needed for cross builds).' -) - option( 'intel-rt', type : 'feature',