Bug 712584 - Properly use .def files on mingw builds r=khuey
authorJacek Caban <jacek@codeweavers.com>
Tue, 27 Dec 2011 10:51:53 +0100
changeset 84613 2e7253322df9710fea0e43365c822fd5d222a927
parent 84612 ff350b65a6167bc9ddde60ac182588ecc92935e6
child 84614 d78b7af89987e76df150a1c1c248f5c9caa9e020
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs712584
milestone12.0a1
Bug 712584 - Properly use .def files on mingw builds r=khuey
config/rules.mk
js/src/config/rules.mk
memory/mozutils/mozutils.def.in
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -368,16 +368,23 @@ ifdef DEFFILE
 OS_LDFLAGS += -DEF:$(call normalizepath,$(DEFFILE))
 EXTRA_DEPS += $(DEFFILE)
 endif
 
 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
 
 ifeq ($(SOLARIS_SUNPRO_CXX),1)
 ifeq (86,$(findstring 86,$(OS_TEST)))
 OS_LDFLAGS += -M $(topsrcdir)/config/solaris_ia32.map
 endif # x86
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -368,16 +368,23 @@ ifdef DEFFILE
 OS_LDFLAGS += -DEF:$(call normalizepath,$(DEFFILE))
 EXTRA_DEPS += $(DEFFILE)
 endif
 
 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
 
 ifeq ($(SOLARIS_SUNPRO_CXX),1)
 ifeq (86,$(findstring 86,$(OS_TEST)))
 OS_LDFLAGS += -M $(topsrcdir)/config/solaris_ia32.map
 endif # x86
--- a/memory/mozutils/mozutils.def.in
+++ b/memory/mozutils/mozutils.def.in
@@ -1,9 +1,9 @@
-; ***** 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
 ; 1.1 (the "License"); you may not use this file except in compliance with
 ; the License. You may obtain a copy of the License at
 ; http://www.mozilla.org/MPL/
 ;
 ; Software distributed under the License is distributed on an "AS IS" basis,