| OLD | NEW |
|---|
| 1 unset(PNACL_LLVM) | 1 unset(PNACL_LLVM) |
| 2 # Define PNACL_LLVM for LLVM_VERSION <= 3.7 | 2 # Define PNACL_LLVM for LLVM_VERSION <= 3.7 |
| 3 if((NOT LLVM_VERSION_MAJOR GREATER 3) AND (NOT LLVM_VERSION_MINOR GREATER 7)) | 3 if((NOT LLVM_VERSION_MAJOR GREATER 3) AND (NOT LLVM_VERSION_MINOR GREATER 7)) |
| 4 set(PNACL_LLVM 1) | 4 set(PNACL_LLVM 1) |
| 5 endif() | 5 endif() |
| 6 | 6 |
| 7 if(PNACL_LLVM) | 7 if(PNACL_LLVM) |
| 8 add_definitions( | 8 add_definitions( |
| 9 -DPNACL_LLVM | 9 -DPNACL_LLVM |
| 10 ) | 10 ) |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 -DALLOW_LLVM_IR=1 | 43 -DALLOW_LLVM_IR=1 |
| 44 -DALLOW_LLVM_IR_AS_INPUT=1 | 44 -DALLOW_LLVM_IR_AS_INPUT=1 |
| 45 -DALLOW_TIMERS=1 | 45 -DALLOW_TIMERS=1 |
| 46 -DALLOW_MINIMAL_BUILD=0 | 46 -DALLOW_MINIMAL_BUILD=0 |
| 47 -DALLOW_WASM=0 | 47 -DALLOW_WASM=0 |
| 48 -DPNACL_BROWSER_TRANSLATOR=0 | 48 -DPNACL_BROWSER_TRANSLATOR=0 |
| 49 ) | 49 ) |
| 50 add_compile_options(-Wno-undefined-var-template) | 50 add_compile_options(-Wno-undefined-var-template) |
| 51 endif() | 51 endif() |
| 52 | 52 |
| 53 execute_process(COMMAND git rev-parse HEAD |
| 54 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
| 55 OUTPUT_VARIABLE SUBZERO_REVISION |
| 56 OUTPUT_STRIP_TRAILING_WHITESPACE |
| 57 ) |
| 58 add_definitions(-DSUBZERO_REVISION=${SUBZERO_REVISION}) |
| 59 |
| 53 target_link_libraries(pnacl-sz pthread) | 60 target_link_libraries(pnacl-sz pthread) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2247253005:
Subzero: Fix build errors with LLVM trunk. (Closed)
Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master