From 162b11b250dcd7c31c67438a0bb643c718a2ae90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 22 Apr 2025 07:57:45 +0200 Subject: [PATCH] libcxxabi: Pass -fPIC via module options instead of CFLAGS. --- src/libs/libcxx.zig | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/libs/libcxx.zig b/src/libs/libcxx.zig index d832868edc..1561a39949 100644 --- a/src/libs/libcxx.zig +++ b/src/libs/libcxx.zig @@ -397,7 +397,7 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr .optimize_mode = optimize_mode, .structured_cfg = comp.root_mod.structured_cfg, .unwind_tables = unwind_tables, - .pic = comp.root_mod.pic, + .pic = if (target_util.supports_fpic(target)) true else null, .code_model = comp.root_mod.code_model, }, .global = config, @@ -437,9 +437,6 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr try cflags.append("-fvisibility=hidden"); try cflags.append("-fvisibility-inlines-hidden"); - if (target_util.supports_fpic(target)) { - try cflags.append("-fPIC"); - } try cflags.append("-nostdinc++"); try cflags.append("-fstrict-aliasing"); try cflags.append("-std=c++23");