From 20710f367540da4b297010c7e9de99e9ac323b46 Mon Sep 17 00:00:00 2001 From: Gabriel Scherer Date: Mon, 1 Jul 2013 12:12:33 +0000 Subject: [PATCH] [patch by Adrien Nader] build: avoid an unneeded gnu-style conditional in Makefile. The OpenBSD Jenkins slave started failing because of the use of gnu-style conditionals. There's unfortunately no way that I know of to get a conditional syntax that works both with gmake and mk. Fortunately, the conditional wasn't needed at all since the value was already computed in the configure step. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13861 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02 --- byterun/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/byterun/Makefile b/byterun/Makefile index 52d80507e..3ff165458 100644 --- a/byterun/Makefile +++ b/byterun/Makefile @@ -16,11 +16,7 @@ include Makefile.common CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS) $(IFLEXDIR) DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS) $(IFLEXDIR) -ifeq ($(SYSTEM),mingw) -OBJS=$(COMMONOBJS) win32.o main.o -else -OBJS=$(COMMONOBJS) unix.o main.o -endif +OBJS=$(COMMONOBJS) $(UNIX_OR_WIN32).o main.o DOBJS=$(OBJS:.o=.d.o) instrtrace.d.o PICOBJS=$(OBJS:.o=.pic.o)