diff --git a/deps/tools/common.mk b/deps/tools/common.mk index 5506991f62184..8f025a55b67f3 100644 --- a/deps/tools/common.mk +++ b/deps/tools/common.mk @@ -1,5 +1,9 @@ ## Some shared configuration options ## +# NOTE: Do not make RPATH changes in CMAKE_COMMON on platforms other than FreeBSD, since +# it will make its way into the LLVM build flags, and LLVM is picky about RPATH (though +# apparently not on FreeBSD). Ref PR #22352 + CONFIGURE_COMMON := --prefix=$(abspath $(build_prefix)) --build=$(BUILD_MACHINE) --libdir=$(abspath $(build_libdir)) --bindir=$(abspath $(build_depsbindir)) $(CUSTOM_LD_LIBRARY_PATH) ifneq ($(XC_HOST),) CONFIGURE_COMMON += --host=$(XC_HOST) @@ -40,10 +44,6 @@ CMAKE_COMMON += -DCMAKE_RC_COMPILER="$$(which $(CROSS_COMPILE)windres)" endif endif -# NOTE: Do not make RPATH changes in CMAKE_COMMON on platforms other than FreeBSD, since -# it will make its way into the LLVM build flags, and LLVM is picky about RPATH (though -# apparently not on FreeBSD). Ref PR #22352 - # For now this is LLVM specific, but I expect it won't be in the future ifeq ($(CMAKE_GENERATOR),Ninja) CMAKE_GENERATOR_COMMAND := -G Ninja