Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add -Wall -pedantic and other common flags to ~/.R/Makevars in gcc13 and gcc14 #75

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions containers/gcc13/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ COPY r-check /usr/local/bin

RUN dnf -y install pkg-config devscripts-checkbashisms qpdf git tidy

# ------------------------------------------------------------------------------------
# Makevars

RUN mkdir -p /root/.R
COPY Makevars /root/.R
# we need to set this, because GHA changes $HOME:
# https://github.com/actions/runner/issues/863
ENV R_MAKEVARS_USER=/root/.R/Makevars

# ------------------------------------------------------------------------------------
# CRAN's config from https://www.stats.ox.ac.uk/pub/bdr/gcc13/README.txt
#
Expand Down
14 changes: 14 additions & 0 deletions containers/gcc13/Makevars
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
CFLAGS=-O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3
C17FLAGS=-O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3
C23FLAGS=-O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3
C90FLAGS=-O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3
C99FLAGS=-O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3

CXXFLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3
CXX11FLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3
CXX14FLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3
CXX17FLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3
CXX20FLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3
CXX23FLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3

FFLAGS=-O2 -pedantic
9 changes: 9 additions & 0 deletions containers/gcc14/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@ COPY r-check /usr/local/bin

RUN dnf -y install pkg-config devscripts-checkbashisms qpdf git tidy

# ------------------------------------------------------------------------------------
# Makevars

RUN mkdir -p /root/.R
COPY Makevars /root/.R
# we need to set this, because GHA changes $HOME:
# https://github.com/actions/runner/issues/863
ENV R_MAKEVARS_USER=/root/.R/Makevars

# ------------------------------------------------------------------------------------
# CRAN's config from https://www.stats.ox.ac.uk/pub/bdr/gcc14/README.txt
#
Expand Down
14 changes: 14 additions & 0 deletions containers/gcc14/Makevars
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
CFLAGS=-O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3
C17FLAGS=-O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3
C23FLAGS=-O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3
C90FLAGS=-O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3
C99FLAGS=-O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3

CXXFLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3
CXX11FLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3
CXX14FLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3
CXX17FLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3
CXX20FLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3
CXX23FLAGS=-O3 -Wall -pedantic -frtti -Wp,-D_FORTIFY_SOURCE=3

FFLAGS=-O2 -pedantic