fixup commit for tag 'NSPRPUB_20000201'NSPRPUB_20000201

2 files changed, 27 insertions, 0 deletions

diff --git a/config/prdepend.h b/config/prdepend.h
new file mode 100644
index 00000000..16423bc7
--- /dev/null
+++ b/config/prdepend.h
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ * 
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ * 
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2000 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * A dummy header file that is a dependency for all the object files.
+ * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
+ * depend builds.  See comments in rules.mk.
+ */
+
+#error "Do not include this header file."
diff --git a/config/rules.mk b/config/rules.mk
index 4b5829c3..15430076 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -62,12 +62,14 @@ endif
 
 ifdef USE_AUTOCONF
 ifdef INTERNAL_TOOLS
+ifdef CROSS_COMPILE
 CC=$(HOST_CC)
 CCC=$(HOST_CXX)
 CFLAGS=$(HOST_CFLAGS)
 CXXFLAGS=$(HOST_CXXFLAGS)
 endif
 endif
+endif
 
 #
 # This makefile contains rules for building the following kinds of