Permalink
Browse files

Reflecting commit 14978 on version/4.02:

PR#6268: -DMODEL_$(MODEL) not passed when building asmrun/arm.p.o


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14979 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
  • Loading branch information...
1 parent bb83542 commit 25b93e0823edfb8e1e09c9fa8dfd6c8497e9f5e9 @xavierleroy xavierleroy committed Jun 10, 2014
Showing with 3 additions and 1 deletion.
  1. +2 −0 Changes
  2. +1 −1 asmrun/Makefile
View
@@ -210,6 +210,8 @@ Bug fixes:
(Alain Frisch and Leo White)
- PR#6267: more information printed by "bt" command of ocamldebug
(Josh Watzman)
+- PR#6268: -DMODEL_$(MODEL) not passed when building asmrun/arm.p.o
+ (Peter Michael Green)
- PR#6273: fix Sys.file_exists on large files (Win32)
(Christoph Bauer)
- PR#6275: Soundness bug related to type constraints
View
@@ -183,7 +183,7 @@ clean::
exit 2; }
.S.p.o:
- $(ASPP) -DSYS_$(SYSTEM) $(ASPPPROFFLAGS) -o $*.p.o $*.S
+ $(ASPP) -DSYS_$(SYSTEM) -DMODEL_$(MODEL) $(ASPPPROFFLAGS) -o $*.p.o $*.S
.c.d.o:
ln -s -f $*.c $*.d.c

0 comments on commit 25b93e0

Please sign in to comment.