Skip to content

Commit bd8792c

Browse files
author
ripley
committed
remove C++1[14] support from R CMD config
git-svn-id: https://svn.r-project.org/R/trunk@89143 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent b623c43 commit bd8792c

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

src/scripts/config

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,6 @@ Variables:
6262
CXXFLAGS compiler flags for CXX
6363
CXXPICFLAGS special flags for compiling C++ code to be included in a
6464
shared library
65-
CXX11 compiler command for C++11 code
66-
CXX11STD flag used with CXX11 to enable C++11 support
67-
CXX11FLAGS further compiler flags for CXX11
68-
CXX11PICFLAGS
69-
special flags for compiling C++11 code to be included in
70-
a shared library
71-
CXX14 compiler command for C++14 code
72-
CXX14STD flag used with CXX14 to enable C++14 support
73-
CXX14FLAGS further compiler flags for CXX14
74-
CXX14PICFLAGS
75-
special flags for compiling C++14 code to be included in
76-
a shared library
7765
CXX17 compiler command for C++17 code
7866
CXX17STD flag used with CXX17 to enable C++17 support
7967
CXX17FLAGS further compiler flags for CXX17
@@ -128,9 +116,9 @@ Variables:
128116
SHLIB_CXXFLAGS
129117
additional CXXFLAGS used when building shared objects
130118
SHLIB_CXXLD command for linking shared objects which contain
131-
object files from a C++ compiler (and CXX11 CXX14 CXX17 CXX20 CXX23 CXX26)
119+
object files from a C++ compiler (and CXX17 CXX20 CXX23 CXX26)
132120
SHLIB_CXXLDFLAGS
133-
special flags used by SHLIB_CXXLD (and CXX11 CXX14 CXX17 CXX20 CXX23 CXX26)
121+
special flags used by SHLIB_CXXLD (and CXX17 CXX20 CXX23 CXX26)
134122
SHLIB_EXT file extension (including '.') for shared objects
135123
SHLIB_FFLAGS additional FFLAGS used when building shared objects
136124
SHLIB_LD command for linking shared objects which contain
@@ -293,13 +281,13 @@ fi
293281
query="${MAKE} -s ${makefiles} print R_HOME=${R_HOME}"
294282

295283
ok_c_vars="CC CFLAGS CPICFLAGS CPPFLAGS CC17 C17FLAGS CC23 C23FLAGS CC90 C90FLAGS CC99 C99FLAGS"
296-
ok_cxx_vars="CXX CXXFLAGS CXXPICFLAGS CXX11 CXX11STD CXX11FLAGS CXX11PICFLAGS CXX14 CXX14STD CXX14FLAGS CXX14PICFLAGS CXX17 CXX17STD CXX17FLAGS CXX17PICFLAGS CXX20 CXX20STD CXX20FLAGS CXX20PICFLAG CXX23 CXX23STD CXX23FLAGS CXX23PICFLAGS CXX26 CXX26STD CXX26FLAGS CXX26PICFLAGS"
284+
ok_cxx_vars="CXX CXXFLAGS CXXPICFLAGS CXX17 CXX17STD CXX17FLAGS CXX17PICFLAGS CXX20 CXX20STD CXX20FLAGS CXX20PICFLAG CXX23 CXX23STD CXX23FLAGS CXX23PICFLAGS CXX26 CXX26STD CXX26FLAGS CXX26PICFLAGS"
297285
ok_dylib_vars="DYLIB_EXT DYLIB_LD DYLIB_LDFLAGS"
298286
ok_objc_vars="OBJC OBJCFLAGS"
299287
ok_java_vars="JAVA JAVAC JAVAH JAR JAVA_HOME JAVA_LIBS JAVA_CPPFLAGS"
300288
ok_ftn_vars="FC FFLAGS FPICFLAGS FLIBS FCFLAGS SAFE_FFLAGS"
301289
ok_ld_vars="LDFLAGS"
302-
ok_shlib_vars="SHLIB_CFLAGS SHLIB_CXXFLAGS SHLIB_CXXLD SHLIB_CXXLDFLAGS SHLIB_CXX11LD SHLIB_CXX11LDFLAGS SHLIB_CXX14LD SHLIB_CXX14LDFLAGS SHLIB_CXX17LD SHLIB_CXX17LDFLAGS SHLIB_CXX20LD SHLIB_CXX20LDFLAGS SHLIB_CXX23LD SHLIB_CXX23LDFLAGS HLIB_CXX26LD SHLIB_CXX266DFLAGS SHLIB_EXT SHLIB_FFLAGS SHLIB_LD SHLIB_LDFLAGS"
290+
ok_shlib_vars="SHLIB_CFLAGS SHLIB_CXXFLAGS SHLIB_CXXLD SHLIB_CXXLDFLAGS SHLIB_CXX17LD SHLIB_CXX17LDFLAGS SHLIB_CXX20LD SHLIB_CXX20LDFLAGS SHLIB_CXX23LD SHLIB_CXX23LDFLAGS HLIB_CXX26LD SHLIB_CXX266DFLAGS SHLIB_EXT SHLIB_FFLAGS SHLIB_LD SHLIB_LDFLAGS"
303291
ok_tcltk_vars="TCLTK_CPPFLAGS TCLTK_LIBS"
304292
ok_other_vars="BLAS_LIBS LAPACK_LIBS MAKE LIBnn AR NM RANLIB LTO LTO_FC LTO_LD"
305293
defunct_vars="CPP CXXCPP"

0 commit comments

Comments
 (0)