Skip to content

Commit

Permalink
Rollback patch for archive creation that broke clang compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
Galfurian committed Jan 15, 2024
1 parent c2f660f commit 5ce583f
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 12 deletions.
3 changes: 0 additions & 3 deletions libc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
endif(CMAKE_BUILD_TYPE STREQUAL "Debug")

SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")

# =============================================================================
# Add the library.
add_library(
Expand Down
3 changes: 0 additions & 3 deletions mentos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
endif(CMAKE_BUILD_TYPE STREQUAL "Debug")

SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")

# =============================================================================
# SOURCES
# =============================================================================
Expand Down
3 changes: 0 additions & 3 deletions programs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
endif(CMAKE_BUILD_TYPE STREQUAL "Debug")

SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")

# =============================================================================
# BUILD
# =============================================================================
Expand Down
3 changes: 0 additions & 3 deletions programs/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
endif(CMAKE_BUILD_TYPE STREQUAL "Debug")

SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")

# =============================================================================
# BUILD
# =============================================================================
Expand Down

1 comment on commit 5ce583f

@fischerling
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could detect the compiler and use ranlib dependent on the compiler. Something like my fix-clang-ranlib branch.
But I have no idea why we actually do this. So maybe it is best to just remove it.

Please sign in to comment.