@@ -177,6 +177,7 @@ class JobDetails:
177
177
brew_packages : list [str ] = dataclasses .field (default_factory = list )
178
178
cmake_toolchain_file : str = ""
179
179
cmake_arguments : list [str ] = dataclasses .field (default_factory = list )
180
+ cmake_generator : str = "Ninja"
180
181
cmake_build_arguments : list [str ] = dataclasses .field (default_factory = list )
181
182
clang_tidy : bool = True
182
183
cppflags : list [str ] = dataclasses .field (default_factory = list )
@@ -226,6 +227,7 @@ class JobDetails:
226
227
setup_python : bool = False
227
228
pypi_packages : list [str ] = dataclasses .field (default_factory = list )
228
229
setup_gage_sdk_path : str = ""
230
+ binutils_strings : str = "strings"
229
231
230
232
def to_workflow (self , enable_artifacts : bool ) -> dict [str , str | bool ]:
231
233
data = {
@@ -259,6 +261,7 @@ def to_workflow(self, enable_artifacts: bool) -> dict[str, str|bool]:
259
261
"cflags" : my_shlex_join (self .cppflags + self .cflags ),
260
262
"cxxflags" : my_shlex_join (self .cppflags + self .cxxflags ),
261
263
"ldflags" : my_shlex_join (self .ldflags ),
264
+ "cmake-generator" : self .cmake_generator ,
262
265
"cmake-toolchain-file" : self .cmake_toolchain_file ,
263
266
"clang-tidy" : self .clang_tidy ,
264
267
"cmake-arguments" : my_shlex_join (self .cmake_arguments ),
@@ -294,6 +297,7 @@ def to_workflow(self, enable_artifacts: bool) -> dict[str, str|bool]:
294
297
"setup-python" : self .setup_python ,
295
298
"pypi-packages" : my_shlex_join (self .pypi_packages ),
296
299
"setup-ngage-sdk-path" : self .setup_gage_sdk_path ,
300
+ "binutils-strings" : self .binutils_strings ,
297
301
}
298
302
return {k : v for k , v in data .items () if v != "" }
299
303
@@ -682,13 +686,16 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
682
686
job .shared_lib = SharedLibType .SO_0
683
687
job .static_lib = StaticLibType .A
684
688
case SdlPlatform .N3ds :
685
- job .ccache = True
689
+ job .cmake_generator = "Unix Makefiles"
690
+ job .cmake_build_arguments .append ("-j$(nproc)" )
691
+ job .ccache = False
686
692
job .shared = False
687
- job .apt_packages = ["ccache" , "ninja-build" , "binutils" ]
693
+ job .apt_packages = []
688
694
job .clang_tidy = False
689
695
job .run_tests = False
690
696
job .cc_from_cmake = True
691
697
job .cmake_toolchain_file = "${DEVKITPRO}/cmake/3DS.cmake"
698
+ job .binutils_strings = "/opt/devkitpro/devkitARM/bin/arm-none-eabi-strings"
692
699
job .static_lib = StaticLibType .A
693
700
case SdlPlatform .Msys2 :
694
701
job .ccache = True
0 commit comments