mozilla-inbound: changeset 91155:182a625801b4901848d61714ab00e4f0fa593091

author	Jacek Caban <jacek@codeweavers.com>
	Fri, 06 Apr 2012 11:13:28 +0200
changeset 91155	182a625801b4901848d61714ab00e4f0fa593091
parent 91154	377193a363ed95c8fed3148d15ab7dfa8f0272ba
child 91156	ff3f6dc5547240c685c391294934ab315fd1cf2f
push id	8051
push user	jacek@codeweavers.com
push date	Fri, 06 Apr 2012 09:19:44 +0000
treeherder	mozilla-inbound@182a625801b4 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	glandium
bugs	742281
milestone	14.0a1
first release with	nightly linux32 4721cf101ae6 / 14.0a1 / 20120407031232 / files nightly linux64 4721cf101ae6 / 14.0a1 / 20120407031232 / files nightly mac 4721cf101ae6 / 14.0a1 / 20120407031232 / files nightly win32 4721cf101ae6 / 14.0a1 / 20120407031232 / files nightly win64 4721cf101ae6 / 14.0a1 / 20120407031232 / files
last release without	nightly linux32 da0d07b5ca1e / 14.0a1 / 20120406031222 / files nightly linux64 da0d07b5ca1e / 14.0a1 / 20120406031222 / files nightly mac da0d07b5ca1e / 14.0a1 / 20120406031222 / files nightly win32 da0d07b5ca1e / 14.0a1 / 20120406031222 / files nightly win64 da0d07b5ca1e / 14.0a1 / 20120406031222 / files

--- a/xpcom/tests/windows/Makefile.in
+++ b/xpcom/tests/windows/Makefile.in
@@ -49,9 +49,9 @@ CPP_UNIT_TESTS	= \
                   $(NULL)
 
 # TestNTFSPermissions is causing oranges because it's creating directories
 # multiple times, and then leaving them in a state where they can't be cleaned
 #CPP_UNIT_TESTS += TestNTFSPermissions.cpp
 
 include $(topsrcdir)/config/rules.mk
 
-OS_LIBS	= $(call EXPAND_LIBNAME,rpcrt4 uuid advapi32)
+OS_LIBS	+= $(call EXPAND_LIBNAME,rpcrt4 uuid)