Unnamed repository; edit this file 'description' to name the repository.
build(grammar): remove `-fPIC` flag from windows build (#13169)
Even though there is a check for `is_like_msvc`, when setting `CXX` to `clang++` this will miss that check and try to use `-fPIC`, which is an invlaid flag for the target.
RoloEdits 11 months ago
parent 6bedca8 · commit 8ad6e53
-rw-r--r--helix-loader/src/grammar.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index 29bcf07f..dcf44031 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -496,9 +496,11 @@ fn build_tree_sitter_library(
.arg("/link")
.arg(format!("/out:{}", library_path.to_str().unwrap()));
} else {
+ #[cfg(not(windows))]
+ command.arg("-fPIC");
+
command
.arg("-shared")
- .arg("-fPIC")
.arg("-fno-exceptions")
.arg("-I")
.arg(header_path)
@@ -517,8 +519,11 @@ fn build_tree_sitter_library(
cpp_command.args(compiler.args());
let object_file =
library_path.with_file_name(format!("{}_scanner.o", &grammar.grammar_id));
+
+ #[cfg(not(windows))]
+ cpp_command.arg("-fPIC");
+
cpp_command
- .arg("-fPIC")
.arg("-fno-exceptions")
.arg("-I")
.arg(header_path)