Skip to content

Commit c90d07f

Browse files
authored
ARROW-16141: [R] Update rhub/fedora-clang-devel for upstreamed changes (#12824)
In ARROW-15857 (#12734) we fixed the nightly failures on rhub/fedora-clang-devel by a kludge modifying the default makefile, but also upstreamed the fixes (rstudio/sass#104 and r-hub/rhub-linux-builders#60). These upstreams are now both released, so we can remove the kludge from modification of the docker image. Lead-authored-by: Dewey Dunnington <[email protected]> Co-authored-by: Dewey Dunnington <[email protected]> Signed-off-by: Dewey Dunnington <[email protected]>
1 parent 3c13dc4 commit c90d07f

1 file changed

Lines changed: 0 additions & 19 deletions

File tree

‎ci/scripts/r_docker_configure.sh‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,6 @@ sloppiness = include_file_ctime
6767
hash_dir = false" >> ~/.ccache/ccache.conf
6868
fi
6969

70-
71-
# Special hacking to try to reproduce quirks on fedora-clang-devel on CRAN
72-
# which uses a bespoke clang compiled to use libc++
73-
# https://www.stats.ox.ac.uk/pub/bdr/Rconfig/r-devel-linux-x86_64-fedora-clang
74-
if [ "$RHUB_PLATFORM" = "linux-x86_64-fedora-clang" ]; then
75-
dnf install -y libcxx-devel
76-
sed -i.bak -E -e 's/(CXX1?1? =.*)/\1 -stdlib=libc++/g' $(${R_BIN} RHOME)/etc/Makeconf
77-
rm -rf $(${R_BIN} RHOME)/etc/Makeconf.bak
78-
79-
sed -i.bak -E -e 's/(\-std=gnu\+\+)/-std=c++/g' $(${R_BIN} RHOME)/etc/Makeconf
80-
rm -rf $(${R_BIN} RHOME)/etc/Makeconf.bak
81-
82-
sed -i.bak -E -e 's/(CXXFLAGS = )(.*)/\1 -g -O3 -Wall -pedantic -frtti -fPIC/' $(${R_BIN} RHOME)/etc/Makeconf
83-
rm -rf $(${R_BIN} RHOME)/etc/Makeconf.bak
84-
85-
sed -i.bak -E -e 's/(LDFLAGS =.*)/\1 -stdlib=libc++/g' $(${R_BIN} RHOME)/etc/Makeconf
86-
rm -rf $(${R_BIN} RHOME)/etc/Makeconf.bak
87-
fi
88-
8970
# Special hacking to try to reproduce quirks on centos using non-default build
9071
# tooling.
9172
if [[ "$DEVTOOLSET_VERSION" -gt 0 ]]; then

0 commit comments

Comments
 (0)