build(bindings): make everything c11

tree-sitter · Feb 29, 2024 · b3c14c9 · b3c14c9
1 parent 22c85c6
commit b3c14c9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/cli/src/generate/templates/Package.swift b/cli/src/generate/templates/Package.swift
@@ -43,5 +43,6 @@ let package = Package(
                 ],
                 publicHeadersPath: "bindings/swift",
                 cSettings: [.headerSearchPath("src")])
-    ]
+    ],
+    cLanguageStandard: .c11
 )
diff --git a/cli/src/generate/templates/binding.gyp b/cli/src/generate/templates/binding.gyp
@@ -2,7 +2,9 @@
   "targets": [
     {
       "target_name": "tree_sitter_PARSER_NAME_binding",
-      "dependencies": ["<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except"],
+      "dependencies": [
+        "<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except",
+      ],
       "include_dirs": [
         "src",
       ],
@@ -14,17 +16,6 @@
       "cflags_c": [
         "-std=c11",
       ],
-      "cflags_cc": [
-        "-Wno-cast-function-type",
-      ],
-      "conditions": [
-        ["OS=='mac'", {
-            "cflags+": ["-fvisibility=hidden"],
-            "xcode_settings": {
-              "GCC_SYMBOLS_PRIVATE_EXTERN": "YES", # -fvisibility=hidden
-            }
-        }]
-      ],
     }
   ]
 }
diff --git a/cli/src/generate/templates/build.rs b/cli/src/generate/templates/build.rs
@@ -2,18 +2,18 @@ fn main() {
     let src_dir = std::path::Path::new("src");
 
     let mut c_config = cc::Build::new();
-    c_config.include(src_dir);
+    c_config.std("c11").include(src_dir);
+
     let parser_path = src_dir.join("parser.c");
     c_config.file(&parser_path);
+    println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
 
     // NOTE: if your language uses an external scanner, uncomment this block:
-
     /*
     let scanner_path = src_dir.join("scanner.c");
     c_config.file(&scanner_path);
     println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
     */
 
     c_config.compile("tree-sitter-PARSER_NAME");
-    println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
 }