diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2630631bcf2e010b74325446d06e34405e4c7fff..aa6d915c96fb2055b8b8f7177e0b04c7b8cebff1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ include: platform: 'x86' tagname: 'macOS-x86' gnu_make: 'make' - build_flags: 'CC="ccache cc" CXX="ccache c++" RELEASE=1 VERBOSE=1' + build_flags: 'CC="ccache cc" CXX="ccache c++" RELEASE=1' smoketest-jsexec-linux: tags: [Linux] diff --git a/3rdp/build/CMakeLists-cl.txt b/3rdp/build/CMakeLists-cl.txt index e0de60dc28e769add189c91b1cd070d23ff6bfe1..6c97231a9a40ff74b73c259d9945e1cbf68ca2d5 100644 --- a/3rdp/build/CMakeLists-cl.txt +++ b/3rdp/build/CMakeLists-cl.txt @@ -9,7 +9,7 @@ include(TestBigEndian) find_program(PATCH_BIN patch REQUIRED) find_program(PERL_BIN perl REQUIRED) # Really, this is "GNU patch?" -if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Haiku") +if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Haiku" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") find_program(DOS2UNIX_BIN dos2unix REQUIRED) endif()