Apply COPT to CXXFLAGS as well

petere · petere · commit 0c3930d07689 · 2024-07-01T07:30:55.000+02:00
The main use of that make variable is to pass in -Werror. It makes sense to apply this to C++ as well. Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Reviewed-by: Andres Freund <andres@anarazel.de> Discussion: https://www.postgresql.org/message-id/flat/fe3e200c-edee-44e0-a6e3-d45dca72873b%40eisentraut.org
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
@@ -1937,7 +1937,7 @@ build-postgresql:
      it will break many of <filename>configure</filename>'s built-in tests.  To add
      such flags, include them in the <envar>COPT</envar> environment variable
      while running <filename>make</filename>.  The contents of <envar>COPT</envar>
-     are added to both the <envar>CFLAGS</envar> and <envar>LDFLAGS</envar>
+     are added to the <envar>CFLAGS</envar>, <envar>CXXFLAGS</envar>, and <envar>LDFLAGS</envar>
      options set up by <filename>configure</filename>.  For example, you could do
 <screen>
 <userinput>make COPT='-Werror'</userinput>
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
@@ -741,6 +741,7 @@ endif
 #
 ifdef COPT
    CFLAGS += $(COPT)
+   CXXFLAGS += $(COPT)
    LDFLAGS += $(COPT)
 endif
 

Original file line number	Diff line number	Diff line change
`@@ -741,6 +741,7 @@ endif`
`741`	`741`	`#`
`742`	`742`	`ifdef COPT`
`743`	`743`	`CFLAGS += $(COPT)`
	`744`	`+ CXXFLAGS += $(COPT)`
`744`	`745`	`LDFLAGS += $(COPT)`
`745`	`746`	`endif`
`746`	`747`