diff options
author | Ehsan Akhgari <ehsan@mozilla.com> | 2014-06-11 12:07:24 -0400 |
---|---|---|
committer | Ehsan Akhgari <ehsan@mozilla.com> | 2014-06-12 20:42:18 -0400 |
commit | fb25cd08ed5a87640b02f0feeb10a09b37cfddbe (patch) | |
tree | de0b00ad8945cbb090db4b20e17499d93db70503 | |
parent | df31a85103b0cc232bbc340d7e782a3853c7fad5 (diff) | |
download | libffi-fb25cd08ed5a87640b02f0feeb10a09b37cfddbe.tar.gz |
Add support for building with clang-cl
-rw-r--r-- | README | 7 | ||||
-rw-r--r-- | include/ffi.h.in | 2 | ||||
-rwxr-xr-x | msvcc.sh | 6 |
3 files changed, 12 insertions, 3 deletions
@@ -146,12 +146,17 @@ It's also possible to build libffi on Windows platforms with Microsoft's Visual C++ compiler. In this case, use the msvcc.sh wrapper script during configuration like so: -path/to/configure CC=path/to/msvcc.sh CXX=path/to/msvcc.sh LD=link CPP=\"cl -nologo -EP\" +path/to/configure CC=path/to/msvcc.sh CXX=path/to/msvcc.sh LD=link CPP="cl -nologo -EP" For 64-bit Windows builds, use CC="path/to/msvcc.sh -m64" and CXX="path/to/msvcc.sh -m64". You may also need to specify --build appropriately. +It is also possible to build libffi on Windows platforms with the LLVM +project's clang-cl compiler, like below: + +path/to/configure CC="path/to/msvcc.sh -clang-cl" CXX="path/to/msvcc.sh -clang-cl" LD=link CPP="clang-cl -EP" + When building with MSVC under a MingW environment, you may need to remove the line in configure that sets 'fix_srcfile_path' to a 'cygpath' command. ('cygpath' is not present in MingW, and is not required when diff --git a/include/ffi.h.in b/include/ffi.h.in index 70c6179..ebed0aa 100644 --- a/include/ffi.h.in +++ b/include/ffi.h.in @@ -68,7 +68,7 @@ extern "C" { #ifndef LIBFFI_ASM -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) #define __attribute__(X) #endif @@ -63,11 +63,15 @@ do shift 1 ;; -m64) - cl="cl" # "$MSVC/x86_amd64/cl" ml="ml64" # "$MSVC/x86_amd64/ml64" safeseh= shift 1 ;; + -clang-cl) + cl="clang-cl" + safeseh= + shift 1 + ;; -O0) args="$args -Od" shift 1 |