Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we have to use c++14 now for llvm10

Browse Source
This commit is contained in:
Andrew Kelley 2019-10-02 13:05:10 -04:00
parent 6f10e3fda6
commit ce56ae8afe
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -498,7 +498,7 @@ include_directories(
) )
# These have to go before the -Wno- flags # These have to go before the -Wno- flags
set(EXE_CFLAGS "-std=c++11") set(EXE_CFLAGS "-std=c++14")
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
if(MSVC) if(MSVC)
set(EXE_CFLAGS "${EXE_CFLAGS} /w") set(EXE_CFLAGS "${EXE_CFLAGS} /w")

2
src/zig_llvm.cpp
View File

@ -150,7 +150,7 @@ LLVMTargetMachineRef ZigLLVMCreateTargetMachine(LLVMTargetRef T, const char *Tri
} }
unsigned ZigLLVMDataLayoutGetStackAlignment(LLVMTargetDataRef TD) { unsigned ZigLLVMDataLayoutGetStackAlignment(LLVMTargetDataRef TD) {
return unwrap(TD)->getStackAlignment(); return unwrap(TD)->getStackAlignment().value();
} }
bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef module_ref, bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef module_ref,