PARQUET-656: Revert attempts to make conda artifacts portable

conda.recipe/build.sh

@@ -3,21 +3,19 @@
 set -e
 set -x
 
-# FIXME: This is a hack to make sure the environment is activated.
-# The reason this is required is due to the conda-build issue
-# mentioned below.
-#
-# https://github.com/conda/conda-build/issues/910
-#
-source activate "${CONDA_DEFAULT_ENV}"
-
-# Force the use of gcc 4.9 on Linux (was reset by conda-forge toolchain)
-if [ `uname` == Linux ]; then
-    export CC="gcc-4.9"
-    export CXX="g++-4.9"
+if [ "$(uname)" == "Darwin" ]; then
+  # C++11 finagling for Mac OSX
+  export CC=clang
+  export CXX=clang++
+  export MACOSX_VERSION_MIN="10.7"
+  CXXFLAGS="${CXXFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}"
+  CXXFLAGS="${CXXFLAGS} -stdlib=libc++ -std=c++11"
+  export LDFLAGS="${LDFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}"
+  export LDFLAGS="${LDFLAGS} -stdlib=libc++ -std=c++11"
+  export LINKFLAGS="${LDFLAGS}"
+  export MACOSX_DEPLOYMENT_TARGET=10.7
 fi
 
-
 cd $RECIPE_DIR
 
 # Build dependencies
@@ -46,22 +44,14 @@ pwd
 export PARQUET_INSECURE_CURL=1
 
 ./thirdparty/download_thirdparty.sh
-
 ./thirdparty/build_thirdparty.sh gtest
 
 source thirdparty/versions.sh
 export GTEST_HOME=`pwd`/thirdparty/$GTEST_BASEDIR
 
-if [ `uname` == Linux ]; then
-    SHARED_LINKER_FLAGS='-static-libstdc++'
-elif [ `uname` == Darwin ]; then
-    SHARED_LINKER_FLAGS=''
-fi
-
 cmake \
     -DCMAKE_BUILD_TYPE=release \
     -DCMAKE_INSTALL_PREFIX=$PREFIX \
-    -DCMAKE_SHARED_LINKER_FLAGS=$SHARED_LINKER_FLAGS \
     -DPARQUET_BUILD_BENCHMARKS=off \
     ..
 

conda.recipe/meta.yaml

@@ -12,7 +12,6 @@ build:
 
 requirements:
   build:
-    - toolchain
     - boost
     - cmake
     - zlib