| author |  Andrew Kelley <andrew@ziglang.org> 2019-10-02 13:05:10-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2019-10-02 13:05:10-04:00 |
| log | ce56ae8afe1fd00cc137375332014b8d8a8ef960 |
| tree | e1dd1fc9cd28c63f6f31a68ce7f65da2bfc10ead |
| parent | 6f10e3fda6ca3ef2846c87b149d308fa461fdbb0 |
| signature |  Commit is signed but in an unrecognized format. |
we have to use c++14 now for llvm10
2 files changed, 2 insertions(+), 2 deletions(-)
CMakeLists.txt+1-1
| ... | @@ -498,7 +498,7 @@ include_directories( | ... | @@ -498,7 +498,7 @@ include_directories( |
| 498 | ) | 498 | ) |
| 499 | 499 | ||
| 500 | # These have to go before the -Wno- flags | 500 | # These have to go before the -Wno- flags |
| 501 | set(EXE_CFLAGS "-std=c++11") | 501 | set(EXE_CFLAGS "-std=c++14") |
| 502 | if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") | 502 | if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") |
| 503 | if(MSVC) | 503 | if(MSVC) |
| 504 | set(EXE_CFLAGS "${EXE_CFLAGS} /w") | 504 | set(EXE_CFLAGS "${EXE_CFLAGS} /w") |
src/zig_llvm.cpp+1-1
| ... | @@ -150,7 +150,7 @@ LLVMTargetMachineRef ZigLLVMCreateTargetMachine(LLVMTargetRef T, const char *Tri | ... | @@ -150,7 +150,7 @@ LLVMTargetMachineRef ZigLLVMCreateTargetMachine(LLVMTargetRef T, const char *Tri |
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | unsigned ZigLLVMDataLayoutGetStackAlignment(LLVMTargetDataRef TD) { | 152 | unsigned ZigLLVMDataLayoutGetStackAlignment(LLVMTargetDataRef TD) { |
| 153 | return unwrap(TD)->getStackAlignment(); | 153 | return unwrap(TD)->getStackAlignment().value(); |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef module_ref, | 156 | bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef module_ref, |