From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 14 Mar 2016 12:13:43 +0000 (+0000)
Subject: Fix build for Solaris: "all" must be the first make target.
X-Git-Tag: exim-4_87_RC7~10
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/43ff44e918b762b98b495a91fcd4f0d2f8049bce

Fix build for Solaris: "all" must be the first make target.
Broken-by: dfe7d917154a     Bug 1578
---

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index ff4a83e2c..3f07396f6 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -604,7 +604,7 @@ log.o:           $(HDRS) log.c
 lss.o:           $(HDRS) lss.c
 match.o:         $(HDRS) match.c
 moan.o:          $(HDRS) moan.c
-os.o:            $(HDRS) os.c
+os.o:            $(HDRS) $(OS_C_INCLUDES) os.c
 parse.o:         $(HDRS) parse.c
 queue.o:         $(HDRS) queue.c
 rda.o:           $(HDRS) rda.c
diff --git a/src/OS/Makefile-HP-UX b/src/OS/Makefile-HP-UX
index e00940f32..ea35144bb 100644
--- a/src/OS/Makefile-HP-UX
+++ b/src/OS/Makefile-HP-UX
@@ -22,6 +22,6 @@ EXIMON_TEXTPOP=
 DBMLIB=-lndbm
 RANLIB=@true
 
-os.o: setenv.c
+OS_C_INCLUDES=setenv.c
 
 # End
diff --git a/src/OS/Makefile-SunOS5 b/src/OS/Makefile-SunOS5
index 351b43ad1..568e99f1c 100644
--- a/src/OS/Makefile-SunOS5
+++ b/src/OS/Makefile-SunOS5
@@ -19,6 +19,6 @@ XINCLUDE=-I$(X11)/include
 XLFLAGS=-L$(X11)/lib -R$(X11)/lib
 X11LIB=$(X11)/lib
 
-os.o: setenv.c
+OS_C_INCLUDES=setenv.c
 
 # End
diff --git a/src/OS/os.c-HP-UX b/src/OS/os.c-HP-UX
index 1b78d7eb8..fdd8708a2 100644
--- a/src/OS/os.c-HP-UX
+++ b/src/OS/os.c-HP-UX
@@ -9,6 +9,8 @@
 /* HP-UX-specific code. This is concatenated onto the generic
 src/os.c file. */
 
-#include "setenv.c"
+#ifndef COMPILE_UTILITY
+# include "setenv.c"
+#endif
 
 /* End of os.c-SunHP-UX */
diff --git a/src/OS/os.c-SunOS5 b/src/OS/os.c-SunOS5
index e298f6d54..162486958 100644
--- a/src/OS/os.c-SunOS5
+++ b/src/OS/os.c-SunOS5
@@ -9,7 +9,7 @@
 /* Solaris-specific code. This is concatenated onto the generic
 src/os.c file. */
 
-#ifdef MISSING_UNSETENV_3
+#if defined(MISSING_UNSETENV_3) && !defined(COMPILE_UTILITY)
 # include "setenv.c"
 #endif