diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2015-08-17 11:22:29 -0700 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2015-08-17 11:22:29 -0700 |
| commit | edfddd7b86ae3cc6b1b2440216d4b83cdd9f321b (patch) | |
| tree | 243150dab7af42c35c08dd056ee854bad24a1bdd /coreconf/rules.mk | |
| parent | 03d2e2d3d9d618778194c3759dee4bc625310f55 (diff) | |
| download | nss-hg-edfddd7b86ae3cc6b1b2440216d4b83cdd9f321b.tar.gz | |
Bug 1182667 - Enable warnings as errors, r=rrelyea
Diffstat (limited to 'coreconf/rules.mk')
| -rw-r--r-- | coreconf/rules.mk | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/coreconf/rules.mk b/coreconf/rules.mk index 5495b0c32..0a891ebc7 100644 --- a/coreconf/rules.mk +++ b/coreconf/rules.mk @@ -272,6 +272,10 @@ $(IMPORT_LIBRARY): $(MAPFILE) $(IMPLIB) $@ $< $(RANLIB) $@ endif +ifeq ($(OS_ARCH),WINNT) +$(IMPORT_LIBRARY): $(LIBRARY) + cp -f $< $@ +endif ifdef SHARED_LIBRARY_LIBS ifdef BUILD_TREE @@ -433,8 +437,22 @@ endif # Please keep the next two rules in sync. # $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.cc - @$(MAKE_OBJDIR) + $(MAKE_OBJDIR) +ifdef STRICT_CPLUSPLUS_SUFFIX + echo "#line 1 \"$<\"" | cat - $< > $(OBJDIR)/t_$*.cc + $(CCC) -o $@ -c $(CFLAGS) $(OBJDIR)/t_$*.cc + rm -f $(OBJDIR)/t_$*.cc +else +ifdef USE_NT_C_SYNTAX + $(CCC) -Fo$@ -c $(CFLAGS) $(call core_abspath,$<) +else +ifdef NEED_ABSOLUTE_PATH + $(CCC) -o $@ -c $(CFLAGS) $(call core_abspath,$<) +else $(CCC) -o $@ -c $(CFLAGS) $< +endif +endif +endif #STRICT_CPLUSPLUS_SUFFIX $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.cpp @$(MAKE_OBJDIR) |