Pass CPPFLAGS in HOST_EXPORTS for cross-compilation

Message ID 20250319032003.2883968-1-wsh@iij.ad.jp
State New
Headers
Series Pass CPPFLAGS in HOST_EXPORTS for cross-compilation |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Test passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Test passed

Commit Message

Wataru Ashihara March 19, 2025, 3:19 a.m. UTC
  Fixes the libiberty build for x86_64-netbsd when cross-compiling from
x86_64-linux:

    $ ../configure --host=x86_64--netbsd --disable-gdb \
      CC=/home/wsh/qc/netbsd/zgt.amd64/bin/x86_64--netbsd-gcc \
      CFLAGS='--sysroot=/home/wsh/qc/netbsd/zgd.amd64 -g3' \
      LDFLAGS='--sysroot=/home/wsh/qc/netbsd/zgd.amd64 -static' \
      CPPFLAGS='--sysroot=/home/wsh/qc/netbsd/zgd.amd64' \
      CXX=/home/wsh/qc/netbsd/zgt.amd64/bin/x86_64--netbsd-g++ \
      CXXFLAGS='--sysroot=/home/wsh/qc/netbsd/zgd.amd64' \
      ;

    $ make V=1 all-libiberty
    ...
    ../../libiberty/cp-demangle.c:119:11: fatal error: alloca.h: No such file or directory

    $ grep HAVE_ALLOCA_H libiberty/config.h
    #define HAVE_ALLOCA_H 1  // incorrect on NetBSD

Signed-off-by: Wataru Ashihara <wsh@iij.ad.jp>
---
 Makefile.in  | 2 ++
 Makefile.tpl | 2 ++
 2 files changed, 4 insertions(+)
  

Comments

Tom Tromey March 19, 2025, 4:40 p.m. UTC | #1
>>>>> Wataru Ashihara <wsh@iij.ad.jp> writes:

> Fixes the libiberty build for x86_64-netbsd when cross-compiling from
> x86_64-linux:

I tend to think this is ok, but I think it would be better if you send
this to gcc-patches first.

thanks,
Tom
  

Patch

diff --git a/Makefile.in b/Makefile.in
index f12c251f9c8..af42785519d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -198,6 +198,7 @@  HOST_EXPORTS = \
 	ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
 	CFLAGS="$(CFLAGS)"; export CFLAGS; \
 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+	CPPFLAGS="$(CPPFLAGS)"; export CPPFLAGS; \
 	CXX="$(CXX)"; export CXX; \
 	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
 	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
@@ -441,6 +442,7 @@  GNATBIND = @GNATBIND@
 GNATMAKE = @GNATMAKE@
 
 CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
diff --git a/Makefile.tpl b/Makefile.tpl
index 6e22adecd2f..89789e9a911 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -201,6 +201,7 @@  HOST_EXPORTS = \
 	ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
 	CFLAGS="$(CFLAGS)"; export CFLAGS; \
 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+	CPPFLAGS="$(CPPFLAGS)"; export CPPFLAGS; \
 	CXX="$(CXX)"; export CXX; \
 	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
 	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
@@ -444,6 +445,7 @@  GNATBIND = @GNATBIND@
 GNATMAKE = @GNATMAKE@
 
 CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@