Skip to content

Commit af9f81c

Browse files
author
ripley
committed
entries for C++26
git-svn-id: https://svn.r-project.org/R/trunk@87645 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent a1b5e4c commit af9f81c

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

config.site

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380

381381
## C++23 compiler, optional for use in packages.
382382
## Introduced in R 4.3.0
383-
## The command which runs the C++23 compiler: defaults to $(CXX17), but
383+
## The command which runs the C++23 compiler: defaults to $(CXX20), but
384384
## empty if that (plus standard) cannot compile the tested C++23 code.
385385
## CXX23=
386386

@@ -396,6 +396,24 @@
396396
## SHLIB_CXX23LD=
397397
## SHLIB_CXX23LDFLAGS=
398398

399+
## C++26 compiler, optional for use in packages.
400+
## Introduced in R 4.5.0
401+
## The command which runs the C++26 compiler: defaults to $(CXX20), but
402+
## empty if that (plus standard) cannot compile the tested C++26 code.
403+
## CXX26=
404+
405+
## The 'standard' for the C++26 compiler, which is invoked as
406+
## $(CXX26) $(CXX26STD) for both compiling and linking DSOs/DLLs.
407+
## '-std=gnu++26' and '-std=gnu++2a" are tried by configure, also
408+
## '-std=c++26' and '-std=c++2a"
409+
## CXX26STD=
410+
411+
## Analogues for the C++26 compiler: default to the settings for C++17
412+
## CXX26FLAGS=
413+
## CXX26PICFLAGS=
414+
## SHLIB_CXX26LD=
415+
## SHLIB_CXX26LDFLAGS=
416+
399417
## Additional libraries to link the internet module against.
400418
## Some claim Solaris needs -lsocket -lnsl
401419
## INTERNET_LIBS=
@@ -427,7 +445,7 @@
427445
## The configure code is conservative about enabling OpenMP
428446
## so use can be forced here (or non-use if set but empty).
429447
## For packages (note that SHLIB_OPENMP_CXXFLAGS is for CXX, not
430-
## necessarily for CXX11/14/17/20/23).
448+
## necessarily for CXX11/14/17/20/23/26).
431449
## SHLIB_OPENMP_CFLAGS=
432450
## SHLIB_OPENMP_CXXFLAGS=
433451
## SHLIB_OPENMP_FFLAGS=

0 commit comments

Comments
 (0)