diff options
| author | Louis Dassy <louis.dassy@gmail.com> | 2019-07-15 00:31:27 +0000 |
|---|---|---|
| committer | Louis Dassy <louis.dassy@gmail.com> | 2019-07-15 00:31:27 +0000 |
| commit | 1a2bb13d5bb6024e0b83add27e25dda51b053ef8 (patch) | |
| tree | bd0741374670a84742bb8a5133d5a45b97807832 /coreconf | |
| parent | 349d34d0251b5aee8871435d56076f291ea53a00 (diff) | |
| download | nss-hg-1a2bb13d5bb6024e0b83add27e25dda51b053ef8.tar.gz | |
Bug 1532194 - Remove -DDEBUG_$USER from make builds r=mt
Differential Revision: https://phabricator.services.mozilla.com/D37980
Diffstat (limited to 'coreconf')
| -rw-r--r-- | coreconf/UNIX.mk | 4 | ||||
| -rw-r--r-- | coreconf/WIN32.mk | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/coreconf/UNIX.mk b/coreconf/UNIX.mk index b448e7553..8f6042eee 100644 --- a/coreconf/UNIX.mk +++ b/coreconf/UNIX.mk @@ -14,9 +14,7 @@ ifdef BUILD_OPT DEFINES += -UDEBUG -DNDEBUG else OPTIMIZER += -g - USERNAME := $(shell whoami) - USERNAME := $(subst -,_,$(USERNAME)) - DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) + DEFINES += -DDEBUG -UNDEBUG endif ifdef BUILD_TREE diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk index be795f0ce..634a7a458 100644 --- a/coreconf/WIN32.mk +++ b/coreconf/WIN32.mk @@ -116,11 +116,7 @@ ifdef NS_USE_GCC DEFINES += -UDEBUG -DNDEBUG else OPTIMIZER += -g - NULLSTRING := - SPACE := $(NULLSTRING) # end of the line - USERNAME := $(subst $(SPACE),_,$(USERNAME)) - USERNAME := $(subst -,_,$(USERNAME)) - DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) + DEFINES += -DDEBUG -UNDEBUG endif else # !NS_USE_GCC WARNING_CFLAGS = -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \ @@ -179,10 +175,7 @@ else # !NS_USE_GCC else OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od NULLSTRING := - SPACE := $(NULLSTRING) # end of the line - USERNAME := $(subst $(SPACE),_,$(USERNAME)) - USERNAME := $(subst -,_,$(USERNAME)) - DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) + DEFINES += -DDEBUG -UNDEBUG DLLFLAGS += -DEBUG -OUT:$@ LDFLAGS += -DEBUG ifeq ($(_MSC_VER),$(_MSC_VER_6)) |