Skip to content

Commit e2fc121

Browse files
committed
Update build configuration for osx
1 parent 541d4f3 commit e2fc121

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

conda-recipe/conda_build_config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
boost:
2-
- 1.67
2+
- 1.73
33

44
# only for local build ? see https://github.com/conda/conda-build/issues/4064#issuecomment-702983257
55
#CONDA_BUILD_SYSROOT:

conda-recipe/sconscript.local

+11-9
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
Import('env')
44

55
import os
6+
import platform
67

7-
# Apply environment settings for Anaconda compilers
8-
env.Replace(CXX=os.environ['CXX'])
9-
env.MergeFlags(os.environ['CFLAGS'])
10-
env.MergeFlags(os.environ['CPPFLAGS'])
11-
env.MergeFlags(os.environ['CXXFLAGS'])
12-
env.MergeFlags(os.environ['LDFLAGS'])
8+
if platform.system() != 'Darwin':
9+
# Apply environment settings for Anaconda compilers
10+
env.Replace(CXX=os.environ['CXX'])
11+
env.MergeFlags(os.environ['CFLAGS'])
12+
env.MergeFlags(os.environ['CPPFLAGS'])
13+
env.MergeFlags(os.environ['CXXFLAGS'])
14+
env.MergeFlags(os.environ['LDFLAGS'])
1315

14-
# Use the default c++98 language standard
15-
cxxflags98 = [f for f in env['CXXFLAGS'] if not f.startswith('-std=')]
16-
env.Replace(CXXFLAGS=cxxflags98)
16+
# Use the default c++98 language standard
17+
cxxflags98 = [f for f in env['CXXFLAGS'] if not f.startswith('-std=')]
18+
env.Replace(CXXFLAGS=cxxflags98)
1719

1820
# Silence copious warnings from the boost headers.
1921
P = os.environ['PREFIX']

site_scons/fallback_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
Update FALLBACK_VERSION when tagging a new release.
88
'''
99

10-
FALLBACK_VERSION = '2021.1.1.post0'
10+
FALLBACK_VERSION = '2022.1.post0'

0 commit comments

Comments
 (0)