Bug 743241 - Remove OSARCH and OSTYPE defines from config.mk. r=ted

This commit is contained in:
Mike Hommey 2012-04-25 09:01:10 +02:00
parent a7c8845018
commit 3f4029bbf4
4 changed files with 3 additions and 13 deletions

View File

@ -660,12 +660,6 @@ endif
-include $(topsrcdir)/$(MOZ_BUILD_APP)/app-config.mk
-include $(MY_CONFIG)
######################################################################
# Now test variables that might have been set or overridden by $(MY_CONFIG).
DEFINES += -DOSTYPE=\"$(OS_CONFIG)\"
DEFINES += -DOSARCH=$(OS_ARCH)
######################################################################
GARBAGE += $(DEPENDENCIES) $(MKDEPENDENCIES) $(MKDEPENDENCIES).bak core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB

View File

@ -71,6 +71,8 @@ ifeq ($(OS_ARCH), Linux)
DEFINES += -D_XOPEN_SOURCE=500
endif
DEFINES += -DOSTYPE=\"$(OS_CONFIG)\"
nsUNIXCharset.$(OBJ_SUFFIX): unixcharset.properties.h
unixcharset.properties.h: $(srcdir)/../props2arrays.py unixcharset.properties

View File

@ -660,12 +660,6 @@ endif
-include $(topsrcdir)/$(MOZ_BUILD_APP)/app-config.mk
-include $(MY_CONFIG)
######################################################################
# Now test variables that might have been set or overridden by $(MY_CONFIG).
DEFINES += -DOSTYPE=\"$(OS_CONFIG)\"
DEFINES += -DOSARCH=$(OS_ARCH)
######################################################################
GARBAGE += $(DEPENDENCIES) $(MKDEPENDENCIES) $(MKDEPENDENCIES).bak core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB

View File

@ -692,7 +692,7 @@ progress {
background-color: #0064b4; /* blue */
}
%if OSARCH==OS2
%ifdef XP_OS2
input {
font: medium serif; font-family: inherit
}