Skip to content

Commit

Permalink
Bind to /usr/local/bin/g++ on Travis CI
Browse files Browse the repository at this point in the history
  • Loading branch information
AjayP13 committed Nov 16, 2018
1 parent 6fdf9d7 commit 2d4ee9f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ script:
- /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
- brew install gcc@8 --without-multilib
- export CI_CC="/usr/local/Cellar/gcc/8.2.0/bin/gcc-8 -static-libgcc"
- export GPP_LOC=$(which g++)
- which g++
- sudo mv $GPP_LOC $GPP_LOC.bak
- ls -alh $GPP_LOC || true
- sudo ln -s /usr/local/Cellar/gcc/8.2.0/bin/g++-8 $GPP_LOC
- ls -alh $GPP_LOC || true
- export PATH=/usr/local/bin:$PATH
- echo $PATH
- mv /usr/local/bin/g++ /usr/local/bin/g++.bak || true
- ln -s /usr/local/Cellar/gcc/8.2.0/bin/g++-8 /usr/local/bin/g++
- which g++
- $PIP install pip setuptools -U
- $PIP install cibuildwheel==0.10.0
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,8 @@ def sqlite_misc_extensions(skip=[], zlib=[], windirent=[]):
]
windirent_sources = (
windirent_sources if os.path.basename(source) in windirent else [])
libs = ([
"user32",
"Advapi32",
"Kernel32"] if (sys.platform == "win32" and os.path.basename(source) in windirent) else [])
libs = (["user32", "Advapi32", "Kernel32"] if (
sys.platform == "win32" and os.path.basename(source) in windirent) else [])
miscs.append(
Extension(
SO_PREFIX +
Expand Down
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version_info__ = ('0', '0', '69')
__version_info__ = ('0', '0', '70')
__version__ = '.'.join(__version_info__)

0 comments on commit 2d4ee9f

Please sign in to comment.