Skip to content
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.

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

update scotch #5044

Merged
merged 3 commits into from
Aug 28, 2024
Merged

update scotch #5044

merged 3 commits into from
Aug 28, 2024

Conversation

xq114
Copy link
Contributor

@xq114 xq114 commented Aug 25, 2024

No description provided.

@xq114 xq114 marked this pull request as ready for review August 27, 2024 08:31
@xq114 xq114 requested a review from waruqi August 27, 2024 12:45
packages/s/scotch/xmake.lua Outdated Show resolved Hide resolved
@@ -30,4 +30,6 @@ jobs:
run: |
wget https://curl.haxx.se/ca/cacert.pem -O /tmp/cacert.pem
export CURL_CA_BUNDLE=/tmp/cacert.pem
sudo ln /opt/homebrew/bin/gfortran-14 /opt/homebrew/bin/gfortran
export PATH="$PATH:/opt/homebrew/Cellar/gcc/14.1.0_2/libexec/gcc/aarch64-apple-darwin23/14/"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这是解决啥问题?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

github action提供的macos container自带了gcc-12、gcc-13、gcc-14,但(可能是为了避免冲突)都没有加入PATH,并且可执行文件名字是gfortran-14而不是gfortran,这会导致cmake探测不到。所以这里把gfortran相关处理了一下,使得自带gfortran和正常安装的gfortran一致

@@ -30,4 +30,6 @@ jobs:
run: |
wget https://curl.haxx.se/ca/cacert.pem -O /tmp/cacert.pem
export CURL_CA_BUNDLE=/tmp/cacert.pem
sudo ln /opt/homebrew/bin/gfortran-14 /opt/homebrew/bin/gfortran
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

后面可以看看吧 gcc/gfortran 也整进来,这里先备着 #5069

@waruqi waruqi merged commit a88d8a2 into xmake-io:dev Aug 28, 2024
65 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants