Bug 712584 - Properly use .def files on mingw builds r=khuey

Brli · Dec 27, 2011 · 5e09921 · 5e09921
1 parent 56d9dad
commit 5e09921
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/config/rules.mk b/config/rules.mk
@@ -373,6 +373,13 @@ ifdef MAPFILE
 OS_LDFLAGS += -MAP:$(MAPFILE)
 endif
 
+else #!GNU_CC
+
+ifdef DEFFILE
+OS_LDFLAGS += $(call normalizepath,$(DEFFILE))
+EXTRA_DEPS += $(DEFFILE)
+endif
+
 endif # !GNU_CC
 
 endif # WINNT

diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
@@ -373,6 +373,13 @@ ifdef MAPFILE
 OS_LDFLAGS += -MAP:$(MAPFILE)
 endif
 
+else #!GNU_CC
+
+ifdef DEFFILE
+OS_LDFLAGS += $(call normalizepath,$(DEFFILE))
+EXTRA_DEPS += $(DEFFILE)
+endif
+
 endif # !GNU_CC
 
 endif # WINNT

diff --git a/memory/mozutils/mozutils.def.in b/memory/mozutils/mozutils.def.in
@@ -1,4 +1,4 @@
-; ***** BEGIN LICENSE BLOCK *****
+; ***** BEGIN LICENSE BLOCK *****
 ; Version: MPL 1.1/GPL 2.0/LGPL 2.1
 ;
 ; The contents of this file are subject to the Mozilla Public License Version