Merge pull request #15 from CDAT/gcc7

Gcc7

Author: dnadeau4

.circleci/config.yml

@@ -32,7 +32,7 @@ aliases:
        if [ $CIRCLE_BRANCH == "master" ]; then bash ./ci-support/conda_upload.sh ; fi
        if [ $CIRCLE_BRANCH != "master" ]; then
            export LABEL="unstable";
-           conda install -n root "conda-build<3.10" anaconda-client;
+           conda install -n root "conda-build" anaconda-client;
            bash ./ci-support/conda_upload.sh;
        fi
 

ci-support/conda_upload.sh

@@ -7,10 +7,11 @@ echo ""
 echo "Activating base env"
 source activate base
 echo "Making sure conda-build is installed"
-conda install "conda-build<3.10"
+conda install "conda-build"
 echo "Updating conda"
 conda update -y -q conda
 
+
 if [ `uname` == "Linux" ]; then
     OS=linux-64
     echo "Linux OS"
@@ -30,5 +31,5 @@ rm -rf uvcdat
 export BRANCH=${CIRCLE_BRANCH}
 python ./prep_for_build.py  -b ${BRANCH}
 
-conda build ${PKG_NAME} -c cdat/label/unstable -c conda-forge 
+conda build ${PKG_NAME} -c cdat/label/nightly -c cdat/label/unstable -c conda-forge 
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l $LABEL $CONDA_BLD_PATH/$OS/${PKG_NAME}-$VERSION.`date +%Y*`0.tar.bz2 --force

src/api/Makefile.in

@@ -51,10 +51,10 @@ VPATH=@srcdir@
 CC = @CC@
 ARCH=$(shell uname -m)
 ifeq ($(ARCH),ia64)
-   CC = gcc -fPIC -D__ia64
+   CC = @CC@ -fPIC -D__ia64
 endif
 ifeq ($(ARCH),x86_64)
-   CC = gcc -fPIC -D__x86_64__
+   CC = @CC@ -fPIC -D__x86_64__
 endif
 CFLAGS = -I@srcdir@/../../include @CFLAGS@ $(DEBUG) -Dgrads -I@NCINC@
 CPPFLAGS = @CPPFLAGS@ -DSTNDALN=1 -DBYTEORDER=@GRADS_BYTEORDER@ -DGRADS_CRAY=@GRADS_CRAY@

src/cddrs/Makefile.in

@@ -43,10 +43,10 @@ VPATH=@srcdir@
 CC = @CC@
 ARCH=$(shell uname -m)
 ifeq ($(ARCH),ia64)
-   CC = gcc -fPIC -D__ia64
+   CC = @CC@ -fPIC -D__ia64
 endif
 ifeq ($(ARCH),x86_64)
-   CC = gcc -fPIC -D__x86_64__
+   CC = @CC@ -fPIC -D__x86_64__
 endif
 CFLAGS = -I@srcdir@/../../include -I@NCINC@ -I@HDFINC@ -I@DRSINC@ @CFLAGS@ $(DEBUG) -Dgrads
 CPPFLAGS = @CPPFLAGS@

src/cdunif/Makefile.in

@@ -51,7 +51,7 @@ VPATH=@srcdir@
 # Set the compiler flag for the 64-bit Opteron platform
 ARCH=$(shell uname -m)
 ifeq ($(ARCH),x86_64)
-   CC = gcc -fPIC -D__x86_64__
+   CC = @CC@ -fPIC -D__x86_64__
 else
    CC = @CC@
 endif