BUG - BUILD NT rotd-1997-11-23

[Fergus Henderson]

On 02-Dec-1997, Dominique de Waleffe <ddw at miscrit.be> wrote:
> make  GRADE=asm_fast.gc PROF= libgc.a \
>         libgc.a a
> ../scripts/mgnuc --grade asm_fast.gc --no-ansi --no-check -DSILENT
>  -DDONT_DEFINE -DNO_EXECUTE_PERMISSION      -c alloc.c -o alloc.o
> In file included from gc_priv.h:38,
>                  from alloc.c:18:
> gc.h:40: libgc_dll.h: No such file or directory
> make: *** [alloc.o] Error 1
> make: *** [submake] Error 2
> make: *** [boehm_gc] Error 2

The following patch will (I hope) fix that.
I'll commit this patch today, so it will be included in future ROTDs.

--------------------

boehm_gc/gc.h:
boehm_gc/Makefile:
	Fix a problem where it was trying to #include "libgc_dll.h"
	on Win32 even if USE_DLLS was not specified.  This broke
	things because libgc_dll.h was not generated by the Makefile
	if USE_DLLS is not specified.

Index: gc.h
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/gc.h,v
retrieving revision 1.17
diff -u -u -r1.17 gc.h
--- gc.h	1997/11/21 11:07:37	1.17
+++ gc.h	1997/12/10 03:48:20
@@ -36,7 +36,7 @@
 # define __GC
 # include <stddef.h>
 
-#if defined(__CYGWIN32__) && !defined(GC_DEFINE_DLL)
+#if defined(USE_DLLS)
 #include "libgc_dll.h"
 #endif
 
Index: Makefile
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/Makefile,v
retrieving revision 1.33
diff -u -u -r1.33 Makefile
--- Makefile	1997/11/21 11:07:27	1.33
+++ Makefile	1997/12/10 06:18:19
@@ -425,7 +425,7 @@
 LIBGC_DLL_H = libgc_dll.h 
 LIBGC_GLOBALS_H = libgc_globals.h 
 
-DLL_CFLAGS = -DGC_DEFINE_DLL
+DLL_CFLAGS = -DUSE_DLLS -DGC_DEFINE_DLL
 
 .PHONY: dll
 dll: libgc.dll libgc.a libgc_dll.h libgc_globals.h

-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.