c++: install cp-trait.def as part of plugin headers [PR107136]

Message ID 20221004004216.1994023-1-ppalka@redhat.com
State Accepted, archived
Headers
Series c++: install cp-trait.def as part of plugin headers [PR107136] |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Patrick Palka Oct. 4, 2022, 12:42 a.m. UTC
  This is apparently needed since we include cp-trait.def from cp-tree.h
(in order to define the cp_trait_kind enum), as with operators.def.

Tested on x86_64-pc-linux-gnu by doing make install and verifying
cp-trait.def appears in

  $prefix/lib/gcc/x86_64-pc-linux-gnu/13.0.0/plugin/include/cp/

Does this look OK for trunk?

	PR c++/107136

gcc/cp/ChangeLog:

	* Make-lang.in (CP_PLUGIN_HEADERS): Add cp-trait.def.
---
 gcc/cp/Make-lang.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Jason Merrill Oct. 4, 2022, 3:43 p.m. UTC | #1
On 10/3/22 20:42, Patrick Palka wrote:
> This is apparently needed since we include cp-trait.def from cp-tree.h
> (in order to define the cp_trait_kind enum), as with operators.def.
> 
> Tested on x86_64-pc-linux-gnu by doing make install and verifying
> cp-trait.def appears in
> 
>    $prefix/lib/gcc/x86_64-pc-linux-gnu/13.0.0/plugin/include/cp/
> 
> Does this look OK for trunk?

OK.

> 	PR c++/107136
> 
> gcc/cp/ChangeLog:
> 
> 	* Make-lang.in (CP_PLUGIN_HEADERS): Add cp-trait.def.
> ---
>   gcc/cp/Make-lang.in | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
> index 38d8eeed1f0..aa84d6827be 100644
> --- a/gcc/cp/Make-lang.in
> +++ b/gcc/cp/Make-lang.in
> @@ -39,7 +39,7 @@ CXX_INSTALL_NAME := $(shell echo c++|sed '$(program_transform_name)')
>   GXX_INSTALL_NAME := $(shell echo g++|sed '$(program_transform_name)')
>   CXX_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo c++|sed '$(program_transform_name)')
>   GXX_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo g++|sed '$(program_transform_name)')
> -CP_PLUGIN_HEADERS := cp-tree.h cxx-pretty-print.h name-lookup.h type-utils.h operators.def
> +CP_PLUGIN_HEADERS := cp-tree.h cxx-pretty-print.h name-lookup.h type-utils.h operators.def cp-trait.def
>   
>   #
>   # Define the names for selecting c++ in LANGUAGES.
  

Patch

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 38d8eeed1f0..aa84d6827be 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -39,7 +39,7 @@  CXX_INSTALL_NAME := $(shell echo c++|sed '$(program_transform_name)')
 GXX_INSTALL_NAME := $(shell echo g++|sed '$(program_transform_name)')
 CXX_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo c++|sed '$(program_transform_name)')
 GXX_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo g++|sed '$(program_transform_name)')
-CP_PLUGIN_HEADERS := cp-tree.h cxx-pretty-print.h name-lookup.h type-utils.h operators.def
+CP_PLUGIN_HEADERS := cp-tree.h cxx-pretty-print.h name-lookup.h type-utils.h operators.def cp-trait.def
 
 #
 # Define the names for selecting c++ in LANGUAGES.