Use C23 on Windows for R and R packages.

git-svn-id: https://svn.r-project.org/R/trunk@87747 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: kalibera

doc/NEWS.Rd

@@ -241,12 +241,12 @@
     }
   }
 
-  %% \subsection{INSTALLATION on WINDOWS}{
-  %%   \itemize{
-  %%     \item Both building \R and installing packages use the C compiler
-  %%     in C23 mode. [In progress.]
-  %%   }
-  %% }
+  \subsection{INSTALLATION on WINDOWS}{
+    \itemize{
+      \item Both building \R and installing packages use the C compiler
+      in C23 mode.
+    }
+  }
 
   \subsection{DEPRECATED AND DEFUNCT}{
     \itemize{

src/gnuwin32/Makefile

@@ -59,7 +59,7 @@ MkRules: MkRules.rules
 	@cat MkRules.rules > MkRules
 endif
 
-CFLAGS = -O3 -Wall -pedantic $(EOPTS) $(SANOPTS) $(LTO)
+CFLAGS = -O3 -Wall -pedantic $(CSTD) $(EOPTS) $(SANOPTS) $(LTO)
 FFLAGS = -O3 $(EOPTS) $(LTO)
 
 ifdef DEBUG
@@ -104,7 +104,7 @@ Rpwd.exe: front-ends/Rpwd.exe
 	$(CP) $< $@
 
 front-ends/Rpwd.exe:
-	$(MK) -C front-ends Rpwd
+	$(MK) -C front-ends CSTD='$(CSTD)' Rpwd
 
 ## watch out: R.dll and Rblas.dll depend on each other.
 rbuild:
@@ -204,7 +204,7 @@ libRiconv.dll.a: unicode/iconv.def
 
 
 front-ends:
-	$(MK) -C front-ends
+	$(MK) -C front-ends CSTD='$(CSTD)'
 
 ../extra/tre/libtre.a:
 	$(MK) -C ../extra/tre -f Makefile.win

src/gnuwin32/MkRules.dist

@@ -149,6 +149,9 @@
 # if you do not have texinfo (default),
 # TEXI2ANY = missing
 
+# C standard to use by default (override the compiler default)
+# CSTD = -std=gnu2x
+
 # additional optimization flags (e.g. -mtune=native for a private build)
 #
 # -mstackrealign is used to avoid traps due to misaligned addresses with

src/gnuwin32/MkRules.rules

@@ -98,6 +98,7 @@ TEXI2DVI = env COMSPEC= texi2dvi
 MAKEINFO = texi2any
 EOPTS ?= $(if $(USE_LLVM),,-mfpmath=sse -msse2 -mstackrealign)
 SANOPTS ?=
+CSTD ?= -std=gnu2x
 OPENMP ?= -fopenmp
 PTHREAD ?= -pthread
 ISDIR ?= C:/Program Files (x86)/Inno Setup 6

src/gnuwin32/fixed/Makefile

@@ -30,6 +30,7 @@ fixetc: $(ETC) ../MkRules Makefile
 	$(MKDIR) -p $(R_HOME)/etc/$(R_ARCH)
 	$(SED) -e 's/WIN = 64/WIN = $(WIN)/' \
 	  -e "s/-O3/-O2/" \
+	  -e "s/@CSTD@/$(CSTD)/" \
 	  -e "s/@EOPTS@/$(EOPTS)/" \
 	  -e "s/@SANOPTS@/$(SANOPTS)/" \
 	  -e "s|BINPREF =|BINPREF ?= $(BINPREF)|" \

src/gnuwin32/fixed/etc/Makeconf

@@ -104,7 +104,7 @@ AR = $(BINPREF)$(LLVMPREF)ar
 BLAS_LIBS = -L"$(R_HOME)/$(IMPDIR)" -lRblas
 C_VISIBILITY = 
 CC = $(BINPREF)$(CCBASE) $(M_ARCH)
-CFLAGS = -O3 -Wall $(DEBUGFLAG) @EOPTS@ @SANOPTS@ $(LTO)
+CFLAGS = -O3 -Wall @CSTD@ $(DEBUGFLAG) @EOPTS@ @SANOPTS@ $(LTO)
 CPICFLAGS = 
 CPPFLAGS =
 CC17 = $(BINPREF)$(CCBASE) $(M_ARCH)

src/gnuwin32/front-ends/Makefile

@@ -1,7 +1,7 @@
 include ../MkRules
 R_HOME = ../../..
 
-CFLAGS = -O3 -Wall -pedantic
+CFLAGS = -O3 -Wall -pedantic $(CSTD)
 ifdef DEBUG
  CFLAGS += $(G_FLAG)
  LINKFLAGS =