From 887d0d2735058c8951831c9ba4a11dd98cab0cd2 Mon Sep 17 00:00:00 2001 From: Bart Nijssen Date: Thu, 14 Feb 2019 12:35:27 -0800 Subject: [PATCH 1/2] Update readme.md Fixed documentation button --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 188e89712..bd3825921 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,7 @@ | VIC Links & Badges | | |------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| VIC Documentation | [![Documentation Status](https://readthedocs.org/projects/vic/badge/?version=latest]](http://vic.readthedocs.org/en/latest/) | +| VIC Documentation | [![Documentation Status](https://readthedocs.org/projects/vic/badge/?version=latest)](http://vic.readthedocs.org/en/latest/) | | Travis Build | [![Build Status](https://travis-ci.org/UW-Hydro/VIC.png)](https://travis-ci.org/UW-Hydro/VIC) | | VIC Users Listserve | [![VIC Users Listserve](https://img.shields.io/badge/VIC%20Users%20Listserve-Active-blue.svg)](https://mailman.u.washington.edu/mailman/listinfo/vic_users) | | Developers Gitter Room | [![Join the chat at https://gitter.im/UW-Hydro/VIC](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/UW-Hydro/VIC?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) | From a50ffeff5b5c8b3ec629f21dec22b8047d639478 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 24 Sep 2019 09:47:06 +0200 Subject: [PATCH 2/2] cffi headers: respect $CC if defined default behavior is unchanged, but fixes builds on e.g. conda where compilers have funky names --- vic/drivers/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vic/drivers/python/setup.py b/vic/drivers/python/setup.py index 68e00de93..19d8ce13e 100644 --- a/vic/drivers/python/setup.py +++ b/vic/drivers/python/setup.py @@ -124,7 +124,7 @@ def make_cffi_headers(): 'zwtvmoist_zwt', 'zwtvmoist_moist'] - args = ['gcc', '-std=c99', '-E', + args = [os.environ.get('CC') or 'gcc', '-std=c99', '-E', '-P', os.path.join(vic_root_abs_path, 'vic', 'drivers', 'python', 'src', 'globals.c'), '-I%s' % os.path.join(vic_root_abs_path, 'vic', 'drivers',