]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Replace VSB_DIR by sysroot refs in VxWorks LIBGCC2_INCLUDES
authorOlivier Hainque <hainque@adacore.com>
Fri, 17 Oct 2025 17:53:02 +0000 (17:53 +0000)
committerOlivier Hainque <hainque@adacore.com>
Sat, 25 Oct 2025 13:55:04 +0000 (13:55 +0000)
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  <hainque@adacore.com>

libgcc/
* config/t-vxworks (LIBGCC2_INCLUDES): Replace $(VSB_DIR)
by sysroot references.

libgcc/config/t-vxworks

index 42db6a8cb705ea44393536fb7c2e07be800a007f..ca0d0cfcb6a2ee369338d80fe10a75a73063f58d 100644 (file)
@@ -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