From 971b3d65f5ff02cb355aad5df4cd71b2cf1386ff Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Fri, 20 Sep 2002 08:57:51 +0000 Subject: [PATCH] Link against BIN_FLAGS when building SIMPLE_PROGRAMS. Remove extraneous $@ from HOST_LIBRARY ruleset. Thanks to Stuart Parmenter for the patch. Bug #158720 r=cls git-svn-id: svn://10.0.0.236/trunk@130135 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/rules.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index c25a1ce98af..8adcddaebf5 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/config/rules.mk @@ -866,9 +866,9 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) $(LD) /nologo /out:$@ /pdb:$(PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) else ifeq ($(CPP_PROG_LINK),1) - $(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) + $(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS) else - $(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) + $(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS) endif # CPP_PROG_LINK endif # WINNT && !GNU_CC endif # OS/2 VACPP @@ -981,7 +981,7 @@ endif # OS/2 $(HOST_LIBRARY): $(HOST_OBJS) Makefile rm -f $@ - $(HOST_AR) $(HOST_AR_FLAGS) $@ $(HOST_OBJS) + $(HOST_AR) $(HOST_AR_FLAGS) $(HOST_OBJS) $(HOST_RANLIB) $@ ifdef NO_LD_ARCHIVE_FLAGS