Skip to content

Commit f8c6b5e

Browse files
prj-simonlegrand
authored andcommitted
Fix Xcode versions and remove brew llvm. Direct use of LDFLAGS.
Remove unnecessary variables? Force -ld_classic when necessary? Remove outdated brew clang in MacOS 14 Tmp: Select newest version of Xcode and additional mirror - Add https://joliv.et to overcome ljll network problems Remove CC and CXX parsing for MacOS linker options. Direct use of LDFLAGS
1 parent c585ced commit f8c6b5e

File tree

3 files changed

+28
-10
lines changed

3 files changed

+28
-10
lines changed

.github/workflows/full-mpich.yml

+19-8
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,34 @@ jobs:
7878
- ${{ github.workflow }}
7979

8080
runs-on: macos-${{ matrix.version }}
81-
82-
env:
83-
CC: clang
84-
CXX: clang++
85-
FC: gfortran
86-
F77: gfortran
8781

8882
steps:
8983
- uses: actions/checkout@v4
9084

85+
# Remove homebrew LLVM compiler, and use most recent Xcode development
86+
# tools
87+
- name: Set environment
88+
run: |
89+
if [ "${{ matrix.version }}" -eq "15" ]; then
90+
echo "LLVM_VERSION=18" >> $GITHUB_ENV
91+
sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
92+
elif [ "${{ matrix.version }}" -eq "14" ]; then
93+
echo "LLVM_VERSION=15" >> $GITHUB_ENV
94+
sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
95+
elif [ "${{ matrix.version }}" -eq "13" ]; then
96+
echo "LLVM_VERSION=15" >> $GITHUB_ENV
97+
sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
98+
echo "LDFLAGS=-Wl,-ld_classic -Wl,-commons,use_dylibs" >> $GITHUB_ENV
99+
fi
100+
91101
- name: Install
92102
run: |
93-
brew install gcc m4 git bison hdf5 cmake wget autoconf automake
103+
brew install m4 git bison hdf5 wget autoconf automake
104+
brew remove llvm@$LLVM_VERSION
94105
95106
- name: Symlink GCC & Fortran
96107
run: ./etc/actions/macos/link_fortran.sh "$(uname -p)"
97-
108+
98109
- name: Configure
99110
run: |
100111
autoreconf -i

3rdparty/getall

+8-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,14 @@ sub downloadone{
268268
print "Try (2 times) other site: $url\n";
269269
system $cmd;
270270
if ($?){
271-
$errors.="ERROR: $cmd FAILED\n"
271+
print "Download 3 times failed from $url of $pkg\n";
272+
my $url="https://joliv.et/freefem/pkg/$pkg";
273+
my $cmd="../bin/build/download $url pkg/$pkg $opts";
274+
print "Try (2 times) other site: $url\n";
275+
system $cmd;
276+
if ($?){
277+
$errors.="ERROR: $cmd FAILED\n"
278+
}
272279
}
273280
}
274281

bin/compile-version-MacOS

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ echo2 ================================
173173
export PATH=$prefix/bin:$PATH
174174
#autoreconf -i
175175
tar zxvf AutoGeneratedFile.tar.gz
176-
./configure "--prefix=$prefix" '--enable-download' $optionconf '--enable-m64' 'CXXFLAGS=-Wno-undefined-var-template' "FLIBS=-L$prefix/gnu -lgfortran -lquadmath -Wl,-ld_classic" $addconf
176+
./configure "--prefix=$prefix" '--enable-download' $optionconf '--enable-m64' 'CXXFLAGS=-Wno-undefined-var-template' "FLIBS=-L$prefix/gnu -lgfortran -lquadmath" $addconf
177177
echo2 ================================
178178
echo2 compilation de petc
179179
echo2 ================================

0 commit comments

Comments
 (0)