File tree Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -605,7 +605,7 @@ list(APPEND COMPILER_RT_COMMON_LINK_FLAGS ${stdlib_flag})
605605
606606# Add assembler flags for execute-only code generation. C and C++ flags should have already 
607607# been added to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS. 
608- append_string_if(LLVM_EXECUTE_ONLY_CODE  -DCOMPILER_RT_EXECUTE_ONLY_CODE CMAKE_ASM_FLAGS)
608+ append_string_if(RUNTIMES_EXECUTE_ONLY_CODE  -DCOMPILER_RT_EXECUTE_ONLY_CODE CMAKE_ASM_FLAGS)
609609
610610# TODO: There's a lot of duplication across lib/*/tests/CMakeLists.txt files, 
611611# move some of the common flags to COMPILER_RT_UNITTEST_CFLAGS. 
Original file line number Diff line number Diff line change @@ -162,7 +162,7 @@ if(OS_NAME MATCHES "Android|Linux|Fuchsia" AND
162162      CFLAGS ${TARGET_CFLAGS} 
163163      CMAKE_ARGS -DCMAKE_CXX_COMPILER_WORKS=ON 
164164                 -DCMAKE_POSITION_INDEPENDENT_CODE=ON 
165-                  -DLLVM_EXECUTE_ONLY_CODE =${LLVM_EXECUTE_ONLY_CODE } 
165+                  -DRUNTIMES_EXECUTE_ONLY_CODE =${RUNTIMES_EXECUTE_ONLY_CODE } 
166166                 -DLIBCXXABI_ENABLE_EXCEPTIONS=OFF 
167167                 -DLIBCXX_ABI_NAMESPACE=__Fuzzer
168168                 -DLIBCXX_ENABLE_EXCEPTIONS=OFF )
Original file line number Diff line number Diff line change @@ -139,7 +139,7 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS AND
139139    add_custom_libcxx(libcxx_msan_${arch}  ${LIBCXX_PREFIX} 
140140      DEPS ${MSAN_RUNTIME_LIBRARIES} 
141141      CFLAGS ${MSAN_LIBCXX_CFLAGS}  ${TARGET_CFLAGS} 
142-       CMAKE_ARGS -DLLVM_EXECUTE_ONLY_CODE =${LLVM_EXECUTE_ONLY_CODE } 
142+       CMAKE_ARGS -DRUNTIMES_EXECUTE_ONLY_CODE =${RUNTIMES_EXECUTE_ONLY_CODE } 
143143      USE_TOOLCHAIN)
144144    set (MSAN_LIBCXX_DIR ${LIBCXX_PREFIX} /lib/)
145145
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ if(COMPILER_RT_LIBCXX_PATH AND
3030    add_custom_libcxx(libcxx_tsan_${arch}  ${LIBCXX_PREFIX} 
3131      DEPS ${TSAN_RUNTIME_LIBRARIES} 
3232      CFLAGS ${TARGET_CFLAGS}  -fsanitize=thread
33-       CMAKE_ARGS -DLLVM_EXECUTE_ONLY_CODE =${LLVM_EXECUTE_ONLY_CODE } 
33+       CMAKE_ARGS -DRUNTIMES_EXECUTE_ONLY_CODE =${RUNTIMES_EXECUTE_ONLY_CODE } 
3434      USE_TOOLCHAIN)
3535    list (APPEND  libcxx_tsan_deps libcxx_tsan_${arch} -install -cmake326-workaround)
3636  endforeach ()
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments