diff options
| author | jpierre%netscape.com <devnull@localhost> | 2003-03-28 20:07:30 +0000 |
|---|---|---|
| committer | jpierre%netscape.com <devnull@localhost> | 2003-03-28 20:07:30 +0000 |
| commit | 64fb6c536abfd9d5d0ea71282fc84adfbbad9d07 (patch) | |
| tree | 4d120fc3d7b124c887afb9c5aa0ce6d67986f813 | |
| parent | c820e8dd4a2b2a3e5b2fbe3ab0a626f9b2c11bdd (diff) | |
| download | nss-hg-64fb6c536abfd9d5d0ea71282fc84adfbbad9d07.tar.gz | |
Backout change that broke Sun's build - requires gmake 3.79
| -rw-r--r-- | security/coreconf/rules.mk | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index 1191c6d72..ac55f9279 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -383,22 +383,14 @@ WCCFLAGS3 := $(subst -D,-d,$(WCCFLAGS2)) $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c @$(MAKE_OBJDIR) ifdef USE_NT_C_SYNTAX -ifeq ($(OS_TARGET),OS2) - $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) -else - $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd | sed -e 's|/cygdrive/\(.\)/|\1:/|g;')/$<) -endif + $(CC) -Fo$@ -c $(CFLAGS) $< else $(CC) -o $@ -c $(CFLAGS) $< endif $(PROG_PREFIX)%$(OBJ_SUFFIX): %.c ifdef USE_NT_C_SYNTAX -ifeq ($(OS_TARGET),OS2) - $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) -else - $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd | sed -e 's|/cygdrive/\(.\)/|\1:/|g;')/$<) -endif + $(CC) -Fo$@ -c $(CFLAGS) $< else $(CC) -o $@ -c $(CFLAGS) $< endif @@ -426,11 +418,7 @@ $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S $(OBJDIR)/$(PROG_PREFIX)%: %.cpp @$(MAKE_OBJDIR) ifdef USE_NT_C_SYNTAX -ifeq ($(OS_TARGET),OS2) - $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) -else - $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd | sed -e 's|/cygdrive/\(.\)/|\1:/|g;')/$<) -endif + $(CCC) -Fo$@ -c $(CFLAGS) $< else $(CCC) -o $@ -c $(CFLAGS) $< endif @@ -450,11 +438,7 @@ ifdef STRICT_CPLUSPLUS_SUFFIX rm -f $(OBJDIR)/t_$*.cc else ifdef USE_NT_C_SYNTAX -ifeq ($(OS_TARGET),OS2) - $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) -else - $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd | sed -e 's|/cygdrive/\(.\)/|\1:/|g;')/$<) -endif + $(CCC) -Fo$@ -c $(CFLAGS) $< else $(CCC) -o $@ -c $(CFLAGS) $< endif |