File tree Expand file tree Collapse file tree 2 files changed +2
-18
lines changed Expand file tree Collapse file tree 2 files changed +2
-18
lines changed Original file line number Diff line number Diff line change 4848
4949 - uses : ./.github/workflows/composite-install-matlab
5050
51- - name : Linux CXX
52- if : ${{ matrix.os == 'ubuntu-22.04' }}
53- run : echo "CXXMEX=g++-10" >> $GITHUB_ENV
54-
5551 - name : Fortran FC
5652 if : runner.os == 'macOS'
5753 run : echo "FC=gfortran-14" >> $GITHUB_ENV
Original file line number Diff line number Diff line change @@ -290,7 +290,7 @@ function build_exe(context)
290290
291291function [compiler_opt , linker_opt ] = get_compiler_options()
292292arguments (Output )
293- compiler_opt (1 ,: ) string
293+ compiler_opt (1 ,1 ) string
294294 linker_opt (1 ,1 ) string
295295end
296296
@@ -301,20 +301,12 @@ function build_exe(context)
301301
302302std = " -std=c++17" ;
303303% mex() can't handle string.empty
304- compiler_id = " " ;
305304linker_opt = " " ;
306305
307- % this override is mostly for CI. Ensure auto-compiler flags are still correct if using this.
308- cxxenv = getenv(" CXXMEX" );
309- if ~isempty(cxxenv )
310- compiler_id = " CXX=" + cxxenv ;
311- disp(" MEX compiler override: " + compiler_id )
312- end
313-
314306if msvc
315307 std = " /std:c++17" ;
316308 % on Windows, Matlab doesn't register unsupported MSVC or oneAPI
317- elseif ~strlength( compiler_id ) && cxx .ShortName == " g++"
309+ elseif cxx .ShortName == " g++"
318310 if ~stdlib .version_atleast(cxx .Version , " 8" )
319311 warning(" g++ 8 or newer is required for MEX, detected g++" + cxx .Version )
320312 end
@@ -331,10 +323,6 @@ function build_exe(context)
331323 compiler_opt = " CXXFLAGS=" + opt ;
332324end
333325
334- if strlength(compiler_id )
335- compiler_opt = [compiler_id , compiler_opt ];
336- end
337-
338326end
339327
340328
You can’t perform that action at this time.
0 commit comments