diff options
| author | wtc%google.com <devnull@localhost> | 2009-03-24 22:49:18 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2009-03-24 22:49:18 +0000 |
| commit | a0ddfd5a29993455dd190fdac8a097382980409d (patch) | |
| tree | 2f408790b9b405c62105c91c83201289025bfb8a | |
| parent | 2527801b47718f92798c7a36720be695ef11cd23 (diff) | |
| download | nspr-hg-a0ddfd5a29993455dd190fdac8a097382980409d.tar.gz | |
Fix for bug 473413. Build problem with spaces in path names. r=wtc
Modified Files:
Tag: NSPR_4_7_BRANCH
config/rules.mk pr/src/misc/Makefile.in
| -rw-r--r-- | config/rules.mk | 11 | ||||
| -rw-r--r-- | pr/src/misc/Makefile.in | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/config/rules.mk b/config/rules.mk index e69b48b9..d2968b05 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -401,16 +401,17 @@ endif ifdef NEED_ABSOLUTE_PATH PWD := $(shell pwd) -abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1))) +# The quotes allow absolute paths to contain spaces. +pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))" endif $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp @$(MAKE_OBJDIR) ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) - $(CCC) -Fo$@ -c $(CCCFLAGS) $(call abspath,$<) + $(CCC) -Fo$@ -c $(CCCFLAGS) $(call pr_abspath,$<) else ifdef NEED_ABSOLUTE_PATH - $(CCC) -o $@ -c $(CCCFLAGS) $(call abspath,$<) + $(CCC) -o $@ -c $(CCCFLAGS) $(call pr_abspath,$<) else $(CCC) -o $@ -c $(CCCFLAGS) $< endif @@ -422,10 +423,10 @@ WCCFLAGS3 = $(subst -D,-d,$(WCCFLAGS2)) $(OBJDIR)/%.$(OBJ_SUFFIX): %.c @$(MAKE_OBJDIR) ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) - $(CC) -Fo$@ -c $(CFLAGS) $(call abspath,$<) + $(CC) -Fo$@ -c $(CFLAGS) $(call pr_abspath,$<) else ifdef NEED_ABSOLUTE_PATH - $(CC) -o $@ -c $(CFLAGS) $(call abspath,$<) + $(CC) -o $@ -c $(CFLAGS) $(call pr_abspath,$<) else $(CC) -o $@ -c $(CFLAGS) $< endif diff --git a/pr/src/misc/Makefile.in b/pr/src/misc/Makefile.in index 55791215..79dc59ed 100644 --- a/pr/src/misc/Makefile.in +++ b/pr/src/misc/Makefile.in @@ -94,9 +94,9 @@ ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) $(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c @$(MAKE_OBJDIR) ifeq (,$(filter-out 1100 1200 1300 1310,$(MSC_VER))) - $(CC) -Fo$@ -c $(CFLAGS) -Op $(call abspath,$<) + $(CC) -Fo$@ -c $(CFLAGS) -Op $(call pr_abspath,$<) else - $(CC) -Fo$@ -c $(CFLAGS) -fp:precise $(call abspath,$<) + $(CC) -Fo$@ -c $(CFLAGS) -fp:precise $(call pr_abspath,$<) endif endif |