Skip to content

Commit bb7b9a5

Browse files
Werror no longer needed
1 parent 8ed51cc commit bb7b9a5

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

libc/CMakeLists.txt

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
3434
add_definitions("-D_DEBUG")
3535
endif()
3636

37-
add_compile_options("-Werror=global-constructors")
38-
3937
# Default to C++17
4038
set(CMAKE_CXX_STANDARD 17)
4139

@@ -130,25 +128,20 @@ else()
130128
endif()
131129
endif()
132130

133-
# Defines LIBC_TARGET_ARCHITECTURE and associated macros.
134-
set(LIBC_TARGET_TRIPLE "" CACHE STRING "The target triple for the libc build.")
135-
include(LLVMLibCArchitectures)
136-
137-
# Some targets can only support the full build.
138-
set(default_to_full_build OFF)
139-
if(LIBC_TARGET_OS_IS_GPU)
140-
set(default_to_full_build ON)
141-
endif()
142-
143-
option(LLVM_LIBC_FULL_BUILD "Build and test LLVM libc as if it is the full libc" ${default_to_full_build})
131+
option(LLVM_LIBC_FULL_BUILD "Build and test LLVM libc as if it is the full libc" OFF)
144132
option(LLVM_LIBC_IMPLEMENTATION_DEFINED_TEST_BEHAVIOR "Build LLVM libc tests assuming our implementation-defined behavior" ON)
145133
option(LLVM_LIBC_ENABLE_LINTING "Enables linting of libc source files" OFF)
146134

135+
set(LIBC_TARGET_TRIPLE "" CACHE STRING "The target triple for the libc build.")
136+
147137
option(LIBC_CONFIG_PATH "The path to user provided folder that configures the build for the target system." OFF)
148138

149139
set(LIBC_ENABLE_UNITTESTS ON)
150140
set(LIBC_ENABLE_HERMETIC_TESTS ${LLVM_LIBC_FULL_BUILD})
151141

142+
# Defines LIBC_TARGET_ARCHITECTURE and associated macros.
143+
include(LLVMLibCArchitectures)
144+
152145
set(LIBC_CONFIG_JSON_FILE_LIST "")
153146

154147
if(NOT LIBC_CONFIG_PATH)

0 commit comments

Comments
 (0)