这是indexloc提供的服务，不要输入任何密码
Skip to content

osx-arm64 #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 10, 2020
Merged

osx-arm64 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7234e67
add osx-arm64
isuruf Aug 10, 2020
212c464
MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.7.post.dev…
isuruf Aug 10, 2020
e11966f
manual edit
isuruf Aug 10, 2020
6b3c5ca
Merge branch 'rc' of github.com:conda-forge/libcxx-feedstock into tes…
isuruf Aug 10, 2020
0c44c37
MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.8, and con…
isuruf Aug 10, 2020
d651aa4
Use 11.0.0 compilers
isuruf Aug 10, 2020
1424178
patch is needed only for x86
isuruf Aug 10, 2020
edf2755
osx-64 -> osx-*
isuruf Aug 10, 2020
1f5b114
skip testing
isuruf Aug 10, 2020
3e650a9
MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.8, and con…
isuruf Aug 10, 2020
24648ab
no test
isuruf Aug 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.12'
channel_sources:
- conda-forge/label/llvm_rc,conda-forge,defaults
channel_targets:
Expand Down
6 changes: 4 additions & 2 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
MACOSX_SDK_VERSION:
- '10.12'
channel_sources:
- conda-forge,defaults
- conda-forge/label/llvm_rc,conda-forge,defaults
channel_targets:
- conda-forge llvm_rc
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- 9.0.0
- 11.0.0
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
23 changes: 23 additions & 0 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
channel_sources:
- conda-forge/label/llvm_rc,conda-forge,defaults
channel_targets:
- conda-forge llvm_rc
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- 11.0.0
macos_machine:
- arm64-apple-macos11
macos_min_version:
- '11.0'
openturns:
- '1.15'
pin_run_as_build:
openturns:
max_pin: x.x
target_platform:
- osx-arm64
vc:
- '14'
6 changes: 5 additions & 1 deletion .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions .travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ provider: {linux_aarch64: azure, linux_ppc64le: azure, win: azure, osx: travis}
travis:
osx_image: xcode6.4
conda_forge_output_validation: true
build_platform:
osx_arm64: osx_64
channel_priority: flexible
test_on_native_only: true
12 changes: 5 additions & 7 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
LLVM_PREFIX=$PREFIX

export MACOSX_DEPLOYMENT_TARGET=10.9

if [[ "$target_platform" == "osx-64" ]]; then
if [[ "$target_platform" == osx-* ]]; then
export CFLAGS="$CFLAGS -isysroot $CONDA_BUILD_SYSROOT"
export CXXFLAGS="$CXXFLAGS -isysroot $CONDA_BUILD_SYSROOT"
export LDFLAGS="$LDFLAGS -isysroot $CONDA_BUILD_SYSROOT"
Expand All @@ -12,7 +10,7 @@ export CFLAGS="$CFLAGS -I$LLVM_PREFIX/include -I$BUILD_PREFIX/include"
export LDFLAGS="$LDFLAGS -L$LLVM_PREFIX/lib -Wl,-rpath,$LLVM_PREFIX/lib -L$BUILD_PREFIX/lib -Wl,-rpath,$BUILD_PREFIX/lib"
export PATH="$LLVM_PREFIX/bin:$PATH"

if [[ "$target_platform" != "osx-64" ]]; then
if [[ "$target_platform" != osx-* ]]; then
# build libcxx first
mkdir build
cd build
Expand All @@ -24,7 +22,7 @@ if [[ "$target_platform" != "osx-64" ]]; then
-DLLVM_INCLUDE_DOCS=OFF \
../libcxx

make -j${CPU_COUNT}
make -j${CPU_COUNT} VERBOSE=1
make install
cd ..

Expand All @@ -41,7 +39,7 @@ if [[ "$target_platform" != "osx-64" ]]; then
-DLLVM_INCLUDE_DOCS=OFF \
..

make -j${CPU_COUNT}
make -j${CPU_COUNT} VERBOSE=1
make install
cd ../..

Expand All @@ -59,7 +57,7 @@ if [[ "$target_platform" != "osx-64" ]]; then
-DLLVM_INCLUDE_DOCS=OFF \
../libcxx

make -j${CPU_COUNT}
make -j${CPU_COUNT} VERBOSE=1
make install

cd ..
Expand Down
8 changes: 4 additions & 4 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ vc:
python:
- 3.7
c_compiler_version: # [osx]
- "10.0.1" # [osx]
- "11.0.0" # [osx]
cxx_compiler_version: # [osx]
- "10.0.1" # [osx]
- "11.0.0" # [osx]

channel_targets:
- conda-forge llvm_rc

channel_sources:
- conda-forge/label/llvm_rc,conda-forge,defaults

MACOSX_DEPLOYMENT_TARGET:
- 10.12
MACOSX_SDK_VERSION: # [osx and x86_64]
- 10.12 # [osx and x86_64]
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ source:
- url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.tar.xz
sha256: 25da496d46be7cced8192e21fe4c6ca72eed5366f6ee09b9d436e5d2229f83a4
patches:
- libcxxabi_10.9_compatibility.diff
- libcxxabi_10.9_compatibility.diff # [osx and x86_64]

build:
number: 0
Expand Down