aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBernhard Schommer <bernhardschommer@gmail.com>2016-02-29 16:17:01 +0100
committerBernhard Schommer <bernhardschommer@gmail.com>2016-02-29 16:17:01 +0100
commitd8740a489984f63864a8e4ff728fb7f3871ecb34 (patch)
tree6e616af57b82d64c54c7fc1d116aced42b9a2a6a /Makefile
parent214fc8b834760925e77e3c713c1e7dcf06a4889e (diff)
parent91284897bbc029cacabc36aae024a86a248814ae (diff)
downloadcompcert-d8740a489984f63864a8e4ff728fb7f3871ecb34.tar.gz
compcert-d8740a489984f63864a8e4ff728fb7f3871ecb34.zip
Merge remote-tracking branch 'origin/configuration-split'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b7b99e46..88a8cc6d 100644
--- a/Makefile
+++ b/Makefile
@@ -192,8 +192,11 @@ latexdoc:
compcert.ini: Makefile.config
(echo "stdlib_path=$(LIBDIR)"; \
echo "prepro=$(CPREPRO)"; \
- echo "asm=$(CASM)"; \
echo "linker=$(CLINKER)"; \
+ echo "asm=$(CASM)"; \
+ echo "prepro_options=$(CPREPRO_OPTIONS)";\
+ echo "asm_options=$(CASM_OPTIONS)";\
+ echo "linker_options=$(CLINKER_OPTIONS)";\
echo "arch=$(ARCH)"; \
echo "model=$(MODEL)"; \
echo "abi=$(ABI)"; \