From bc8abe881e925b6cdae4179666a7d3ddbc26e215 Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Fri, 17 Oct 2025 17:53:02 +0000 Subject: [PATCH] Replace VSB_DIR by sysroot refs in VxWorks LIBGCC2_INCLUDES This matches what VXWORKS_ADDITIONAL_CPP_SPEC does, allowing libgcc to build without VSB_DIR defined in the environment as soon as the configure switches featured a proper --with-build-sysroot was provided. Tested with a successful build for --target=powerpc-wrs-vxworks7r2 using mainline sources. 2025-10-23 Olivier Hainque libgcc/ * config/t-vxworks (LIBGCC2_INCLUDES): Replace $(VSB_DIR) by sysroot references. --- libgcc/config/t-vxworks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgcc/config/t-vxworks b/libgcc/config/t-vxworks index 42db6a8cb70..ca0d0cfcb6a 100644 --- a/libgcc/config/t-vxworks +++ b/libgcc/config/t-vxworks @@ -32,7 +32,7 @@ LIB2FUNCS_EXCLUDE += _clear_cache LIBGCC2_INCLUDES = -nostdinc -include vxworks-predef.h -I. \ $(if $(findstring vxworks7, $(target_noncanonical)), \ - -I$(VSB_DIR)/h -I$(VSB_DIR)/share/h -I=/system -I=/public, \ + -I=/../../h -I=/../../share/h -I=/system -I=/public, \ -I=/ -I=/wrn/coreip) \ -isystem $(MULTIBUILDTOP)../../gcc/include-fixed$(MULTISUBDIR) \ -isystem $(MULTIBUILDTOP)../../gcc/include -- 2.47.3