Commit 2d4ee9fe authored by Ajay Patel's avatar Ajay Patel

Bind to /usr/local/bin/g++ on Travis CI

parent 6fdf9d76
Pipeline #36812192 passed with stages
in 134 minutes and 25 seconds
......@@ -24,12 +24,11 @@ script:
- /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
- brew install [email protected] --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
......
......@@ -326,10 +326,8 @@ def get_modules(THIRD_PARTY, INTERNAL, PROJ_PATH,
]
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 +
......
__version_info__ = ('0', '0', '69')
__version_info__ = ('0', '0', '70')
__version__ = '.'.join(__version_info__)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment