From 212f6bc372c4ab1f4f8a3a6fe6948cddefe2fda1 Mon Sep 17 00:00:00 2001 From: Jan Hrastnik Date: Sat, 5 Jun 2021 23:56:04 +0200 Subject: [PATCH] changed flag in build_cpp '/std:c++14' to '/std:c++17' due to tree_sitter_haskell not compiling on msvc without it --- helix-syntax/build.rs | 2 +- helix-syntax/languages/tree-sitter-haskell | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helix-syntax/build.rs b/helix-syntax/build.rs index a392a033..5d539480 100644 --- a/helix-syntax/build.rs +++ b/helix-syntax/build.rs @@ -59,7 +59,7 @@ fn build_cpp(files: Vec, language: &str) { let mut build = cc::Build::new(); let flag = if build.get_compiler().is_like_msvc() { - "/std:c++14" + "/std:c++17" } else { "-std=c++14" }; diff --git a/helix-syntax/languages/tree-sitter-haskell b/helix-syntax/languages/tree-sitter-haskell index 004f2709..237f4eb4 160000 --- a/helix-syntax/languages/tree-sitter-haskell +++ b/helix-syntax/languages/tree-sitter-haskell @@ -1 +1 @@ -Subproject commit 004f2709c460d95fbfd1061f8efc98f36e33c03c +Subproject commit 237f4eb4417c28f643a29d795ed227246afb66f9