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 /configure | |
parent | 18fcf2ffef8b4ba5eb0624b15371e93b4ac88cfe (diff) | |
parent | e2b4459ccd1b0f8436cb70a631772d715e642dcd (diff) | |
download | compcert-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.tar.gz compcert-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.zip |
fix merge conflicts
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -20,6 +20,7 @@ target='' has_runtime_lib=true has_standard_headers=true clightgen=false +responsefile="gnu" usage='Usage: ./configure [options] target @@ -218,6 +219,7 @@ if test "$arch" = "powerpc"; then libmath="-lm" struct_passing="ref-caller" system="diab" + responsefile="diab" ;; *) abi="eabi" @@ -470,6 +472,7 @@ MODEL=$model STRUCT_PASSING=$struct_passing STRUCT_RETURN=$struct_return SYSTEM=$system +RESPONSEFILE=$responsefile EOF else cat >> Makefile.config <<'EOF' @@ -563,6 +566,9 @@ ASM_SUPPORTS_CFI=false # Turn on/off compilation of clightgen CLIGHTGEN=false +# Whether the other tools support responsefiles in gnu syntax +RESPONSEFILE="none" + EOF fi |