|
@@ -751,10 +751,10 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
|
|
|
))
|
|
|
if not build_parallel:
|
|
|
job.cmake_build_arguments.append("-j1")
|
|
|
- if job.cflags:
|
|
|
- job.cmake_arguments.append(f"-DCMAKE_C_FLAGS=\"{my_shlex_join(job.cflags)}\"")
|
|
|
- if job.cxxflags:
|
|
|
- job.cmake_arguments.append(f"-DCMAKE_CXX_FLAGS=\"{my_shlex_join(job.cxxflags)}\"")
|
|
|
+ if job.cflags or job.cppflags:
|
|
|
+ job.cmake_arguments.append(f"-DCMAKE_C_FLAGS=\"{my_shlex_join(job.cflags + job.cppflags)}\"")
|
|
|
+ if job.cxxflags or job.cppflags:
|
|
|
+ job.cmake_arguments.append(f"-DCMAKE_CXX_FLAGS=\"{my_shlex_join(job.cxxflags + job.cppflags)}\"")
|
|
|
if job.ldflags:
|
|
|
job.cmake_arguments.append(f"-DCMAKE_SHARED_LINKER_FLAGS=\"{my_shlex_join(job.ldflags)}\"")
|
|
|
job.cmake_arguments.append(f"-DCMAKE_EXE_LINKER_FLAGS=\"{my_shlex_join(job.ldflags)}\"")
|