diff options
| author | Michael Schmidt <github@mschmidt.me> | 2016-08-17 16:32:56 +0200 |
|---|---|---|
| committer | Michael Schmidt <github@mschmidt.me> | 2016-08-17 16:32:56 +0200 |
| commit | e0f0f573a4a8fc1f564a31388afa9c23e48bb016 (patch) | |
| tree | b7c004b3aae01c79bef8c8914e759a1e3ce358f7 /Makefile | |
| parent | 18fcf2ffef8b4ba5eb0624b15371e93b4ac88cfe (diff) | |
| parent | e2b4459ccd1b0f8436cb70a631772d715e642dcd (diff) | |
| download | compcert-kvx-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.tar.gz compcert-kvx-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.zip | |
fix merge conflicts
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -208,7 +208,8 @@ compcert.ini: Makefile.config echo "has_standard_headers=$(HAS_STANDARD_HEADERS)"; \ echo "asm_supports_cfi=$(ASM_SUPPORTS_CFI)"; \ echo "struct_passing_style=$(STRUCT_PASSING)"; \ - echo "struct_return_style=$(STRUCT_RETURN)";) \ + echo "struct_return_style=$(STRUCT_RETURN)"; \ + echo "response_file_style=$(RESPONSEFILE)";) \ > compcert.ini driver/Version.ml: VERSION |