pass CXXFLAGS

apache · Nov 17, 2018 · db9ee5b · db9ee5b
1 parent 8a8376d
commit db9ee5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ci/docker_build_r.sh b/ci/docker_build_r.sh
@@ -23,6 +23,7 @@ export ARROW_HOME=$CONDA_PREFIX
 
 # For newer GCC per https://arrow.apache.org/docs/python/development.html#known-issues
 export CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
+export PKG_CXXFLAGS=$CXXFLAGS
 
 # Build arrow
 pushd /arrow/r

diff --git a/r/Dockerfile b/r/Dockerfile
@@ -27,9 +27,10 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Build R
 # [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
 # [2] https://linuxize.com/post/how-to-install-r-on-ubuntu-18-04/#installing-r-packages-from-cran
-RUN apt install -y \
-    apt-transport-https \
-    software-properties-common && \
+RUN apt update && \
+    apt install -y \
+        apt-transport-https \
+        software-properties-common && \
     apt-key adv \
         --keyserver keyserver.ubuntu.com \
         --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 && \

diff --git a/r/src/Makevars.in b/r/src/Makevars.in
@@ -16,6 +16,6 @@
 # under the License.
 
 PKG_CPPFLAGS=@cflags@
-PKG_CXXFLAGS=$(C_VISIBILITY)
+PKG_CXXFLAGS+=$(C_VISIBILITY)
 CXX_STD=CXX11
 PKG_LIBS=@libs@  -Wl,-rpath,/usr/local/lib