From 13164b2d2c32923decaf2c19c45353cde4a9ebcd Mon Sep 17 00:00:00 2001
From: jgabry <jgabry@gmail.com>
Date: Thu, 24 Sep 2026 11:11:03 -0600
Subject: [PATCH] Skip --disable-new-dtags on Windows when TBB_LIB is set

Fixes #3414
---
 make/compiler_flags | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/make/compiler_flags b/make/compiler_flags
index a78e8ccd9b4..7774648737f 100644
--- a/make/compiler_flags
+++ b/make/compiler_flags
@@ -296,14 +296,14 @@ else
 CXXFLAGS_TBB ?= $(INC_DIR_OPT) $(TBB)/include
 endif
 
-# MacOS ld does not support --disable-new-dtags
-ifneq ($(OS),Darwin)
-  LDFLAGS_TBB_DTAGS ?= -Wl,--disable-new-dtags
-endif
-
 # Windows LLVM/Clang does not support -rpath, but is not needed on Windows anyway
 ifneq ($(OS), Windows_NT)
   LDFLAGS_TBB_RPATH ?= -Wl,-rpath,"$(TBB_LIB)"
+  # --disable-new-dtags only matters alongside -rpath; MacOS ld does not
+  # support it
+  ifneq ($(OS),Darwin)
+    LDFLAGS_TBB_DTAGS ?= -Wl,--disable-new-dtags
+  endif
 endif
 
 LDFLAGS_TBB ?= -Wl,-L,"$(TBB_LIB)" $(LDFLAGS_TBB_DTAGS) $(LDFLAGS_TBB_RPATH)