Skip to content

Commit

Permalink
Apparently docker doesn't count as linux
Browse files Browse the repository at this point in the history
  • Loading branch information
Kale-Ko committed Jun 10, 2024
1 parent 61c330f commit bc715fd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ jobs:
java_version: [ 8, 11, 17, 21 ]

needs: [ Linux-Build ]
if: ${{ !(inputs.run_all_builds == true) }}
if: ${{ inputs.run_all_builds == true }}

name: Linux-${{ matrix.architecture.name }}-Test-JDK${{ matrix.java_version }}-Docker-Ubuntu_${{ matrix.ubuntu_version }}
runs-on: ubuntu-latest
Expand Down
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,11 @@ else(WIN32)
SET(STATIC_LIBRARY_CXX_FLAGS)
endif()

IF(LINUX)
if(LINUX OR (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static-libstdc++")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
endif()

message(STATUS ${CMAKE_C_FLAGS})
message(STATUS ${CMAKE_CXX_FLAGS})

add_library (brotli ${LIB_TYPE}
"brotli/common/constants.c"
"brotli/common/context.c"
Expand Down

0 comments on commit bc715fd

Please sign in to comment.