Skip to content

Commit ddd49cc

Browse files
authored
Merge pull request #2266 from Smit-create/i-2264
CMAKE: Set linker language
2 parents c996185 + d61f30a commit ddd49cc

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

integration_tests/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,13 +375,15 @@ macro(COMPILE)
375375
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.py
376376
VERBATIM)
377377
add_library(${name} OBJECT ${name}.o)
378+
set_target_properties(${name} PROPERTIES LINKER_LANGUAGE C)
378379
elseif(KIND STREQUAL "c")
379380
add_custom_command(
380381
OUTPUT ${name}.c
381382
COMMAND ${LPYTHON} ${extra_args} --disable-main --show-c ${CMAKE_CURRENT_SOURCE_DIR}/${name}.py > ${name}.c
382383
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.py
383384
VERBATIM)
384385
add_library(${name} OBJECT ${name}.c)
386+
set_target_properties(${name} PROPERTIES LINKER_LANGUAGE C)
385387
target_link_libraries(${name} lpython_rtlib)
386388
elseif(KIND STREQUAL "cpython")
387389
# CPython test

integration_tests/run_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def run_test(backend):
2525
run_cmd(f"mkdir {BASE_DIR}/_lpython-tmp-test-{backend}", cwd=BASE_DIR)
2626
cwd = f"{BASE_DIR}/_lpython-tmp-test-{backend}"
2727
run_cmd(f"cmake -DKIND={backend} -DFAST={fast_tests} -DPYTHON_LIBS_REQ={python_libs_req} ..", cwd=cwd)
28-
run_cmd(f"make -j{DEFAULT_THREADS_TO_USE}", cwd=cwd)
28+
run_cmd(f"cmake --build . --parallel {DEFAULT_THREADS_TO_USE}", cwd=cwd)
2929
run_cmd(f"ctest -j{DEFAULT_THREADS_TO_USE} --output-on-failure",
3030
cwd=cwd)
3131

0 commit comments

Comments
 (0)