fix up my conda build script

PDAL · Mar 28, 2019 · d29e234 · d29e234
1 parent 0561970
commit d29e234
Showing 1 changed file with 2 additions and 37 deletions.
diff --git a/scripts/conda/osx.sh b/scripts/conda/osx.sh
@@ -1,41 +1,6 @@
-export CONDA_EXE=/Users/hobu/miniconda3/bin/conda
-source /Users/hobu/miniconda3/bin/activate base
-
-export CONDA_BUILD_SYSROOT=/opt/MacOSX10.10.sdk
-
-$CONDA_EXE remove pdal
-source /Users/hobu/miniconda3/bin/activate pdal
-$CONDA_EXE config --add channels conda-forge
-$CONDA_EXE create --name pdal -y
-$CONDA_EXE install  -y laz-perf \
-                laszip \
-                libunwind \
-                geotiff \
-                jsoncpp \
-                sqlite \
-                libxml2 \
-                nitro \
-                curl \
-                gdal \
-                postgresql \
-                hdf5 \
-                pcl \
-                cmake \
-                compilers \
-                libspatialite \
-                eigen \
-                ninja \
-                libgdal \
-                zstd \
-                numpy \
-                tiledb
 
 BUILDDIR=conda-build
 
-export CC=${CONDA_PREFIX}/bin/clang
-export CXX=${CONDA_PREFIX}/bin/clang++
-export GDAL_HOME=${CONDA_PREFIX}
-
 #CONFIG="Unix Makefiles"
 CONFIG="Ninja"
 
@@ -47,7 +12,7 @@ fi
 rm -rf $BUILDDIR
 mkdir -p $BUILDDIR
 cd $BUILDDIR
-CC=$CC CXX=$CXX cmake   -G "$CONFIG"  \
+CC=/usr/bin/cc CXX=/usr/bin/c++ cmake   -G "$CONFIG"  \
         -DCMAKE_LIBRARY_PATH:FILEPATH="$CONDA_PREFIX/lib" \
         -DCMAKE_INCLUDE_PATH:FILEPATH="$CONDA_PREFIX/include" \
         -DCMAKE_BUILD_TYPE=Debug \
@@ -57,7 +22,7 @@ CC=$CC CXX=$CXX cmake   -G "$CONFIG"  \
         -DBUILD_PLUGIN_NITF=ON \
         -DBUILD_PLUGIN_PYTHON=ON \
         -DBUILD_PLUGIN_ICEBRIDGE=ON \
-        -DBUILD_PLUGIN_PCL=ON \
+        -DBUILD_PLUGIN_PCL=OFF \
         -DBUILD_PLUGIN_GREYHOUND=ON \
         -DBUILD_PLUGIN_TILEDB=ON \
         -DWITH_LAZPERF=ON \