r-rzmq and rstudio: MACOSX_DEPLOYMENT_TARGET fixes

conda-archive · Aug 13, 2017 · c5e5439 · c5e5439
1 parent 2fdcebb
commit c5e5439
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/r-packages/r-rzmq/build.sh b/r-packages/r-rzmq/build.sh
@@ -4,6 +4,10 @@
 mv DESCRIPTION DESCRIPTION.old
 grep -v '^Priority: ' DESCRIPTION.old > DESCRIPTION
 
+if [[ $(uname) == Darwin ]]; then
+  export MACOSX_DEPLOYMENT_TARGET=10.9
+fi
+
 $R CMD INSTALL --build .
 
 # Add more build steps here, if they are necessary.

diff --git a/rstudio/build.sh b/rstudio/build.sh
@@ -44,12 +44,13 @@ _VERBOSE="VERBOSE=1"
 
 declare -a _CMAKE_EXTRA_CONFIG
 if [[ $(uname) == Darwin ]]; then
-  _CMAKE_EXTRA_CONFIG+=(-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET})
   if [[ ${_XCODE_BUILD} == 1 ]]; then
     _CMAKE_EXTRA_CONFIG+=(-G'Xcode')
     _CMAKE_EXTRA_CONFIG+=(-DCMAKE_OSX_ARCHITECTURES=x86_64)
     _VERBOSE=""
   fi
+  unset MACOSX_DEPLOYMENT_TARGET
+  export MACOSX_DEPLOYMENT_TARGET
 else
   _CMAKE_EXTRA_CONFIG+=(-DQT_QMAKE_EXECUTABLE=${PREFIX}/bin/qmake)
 fi