Build the xpt_link and xpt_dump tools early so that they're available as part of the build process, and link them statically so we don't need the shared library path set to use them.

config/rules.mk

@@ -447,7 +447,7 @@ endif
 # creates Foo.o Bar.o, links with LIBS to create Foo, Bar.
 #
 #
-$(SIMPLE_PROGRAMS):$(OBJDIR)/%: $(OBJDIR)/%.o
+$(SIMPLE_PROGRAMS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EXTRA_DEPS)
 ifeq ($(CPP_PROG_LINK),1)
 	$(CCC) $(WRAP_MALLOC_CFLAGS) -o $@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB)
 else

xpcom/libxpt/tools/Makefile.in

@@ -27,14 +27,16 @@ SIMPLE_PROGRAMS	= xpt_dump xpt_link
 
 CSRCS		= xpt_dump.c xpt_link.c
 
-LIBS		= 		\
-		  -L$(DIST)/bin \
-		  -lxpt 	\
-		  $(NULL)
+# Compile directly against the static lib, so we can use the tools
+# during the build without the shared library path being set.
+LIBS		= $(DIST)/lib/libxpt.a
 
-# build these xpt tools early so that it'll be
-# available along with xpidl, which also must be built early.
-export:: libs
+# Tell the $(SIMPLE_PROGRAMS) target that we need to be recompiled
+# when libxpt changes.
+EXTRA_DEPS = $(wildcard $(DIST)/lib/libxpt.*)
+
+# Build xpidl early.  (libs creates .deps used by install.)
+export:: libs install
 
 include $(topsrcdir)/config/rules.mk
 

xpcom/typelib/xpt/tools/Makefile.in

@@ -27,14 +27,16 @@ SIMPLE_PROGRAMS	= xpt_dump xpt_link
 
 CSRCS		= xpt_dump.c xpt_link.c
 
-LIBS		= 		\
-		  -L$(DIST)/bin \
-		  -lxpt 	\
-		  $(NULL)
+# Compile directly against the static lib, so we can use the tools
+# during the build without the shared library path being set.
+LIBS		= $(DIST)/lib/libxpt.a
 
-# build these xpt tools early so that it'll be
-# available along with xpidl, which also must be built early.
-export:: libs
+# Tell the $(SIMPLE_PROGRAMS) target that we need to be recompiled
+# when libxpt changes.
+EXTRA_DEPS = $(wildcard $(DIST)/lib/libxpt.*)
+
+# Build xpidl early.  (libs creates .deps used by install.)
+export:: libs install
 
 include $(topsrcdir)/config/rules.mk