bug 1230117 - get rid of TARGET_MD_ARCH. r=glandium

This commit is contained in:
Ted Mielczarek 2016-01-21 06:07:22 -05:00
parent b7fcd3f1ac
commit f5f80df38e
3 changed files with 1 additions and 7 deletions

View File

@ -944,7 +944,6 @@ OBJ_SUFFIX=o
LIB_SUFFIX=a LIB_SUFFIX=a
ASM_SUFFIX=s ASM_SUFFIX=s
IMPORT_LIB_SUFFIX= IMPORT_LIB_SUFFIX=
TARGET_MD_ARCH=unix
DIRENT_INO=d_ino DIRENT_INO=d_ino
MOZ_USER_DIR=".mozilla" MOZ_USER_DIR=".mozilla"
@ -2366,7 +2365,6 @@ ia64*-hpux*)
AC_DEFINE(WIN32_LEAN_AND_MEAN) AC_DEFINE(WIN32_LEAN_AND_MEAN)
dnl See http://support.microsoft.com/kb/143208 to use STL dnl See http://support.microsoft.com/kb/143208 to use STL
AC_DEFINE(NOMINMAX) AC_DEFINE(NOMINMAX)
TARGET_MD_ARCH=win32
_PLATFORM_DEFAULT_TOOLKIT='cairo-windows' _PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
BIN_SUFFIX='.exe' BIN_SUFFIX='.exe'
MOZ_USER_DIR="Mozilla" MOZ_USER_DIR="Mozilla"
@ -8855,7 +8853,6 @@ AC_SUBST(HOST_OS_ARCH)
AC_SUBST(TARGET_CPU) AC_SUBST(TARGET_CPU)
AC_SUBST(TARGET_VENDOR) AC_SUBST(TARGET_VENDOR)
AC_SUBST(TARGET_OS) AC_SUBST(TARGET_OS)
AC_SUBST(TARGET_MD_ARCH)
AC_SUBST(TARGET_XPCOM_ABI) AC_SUBST(TARGET_XPCOM_ABI)
AC_SUBST(OS_TARGET) AC_SUBST(OS_TARGET)
AC_SUBST(OS_ARCH) AC_SUBST(OS_ARCH)

View File

@ -760,7 +760,6 @@ OBJ_SUFFIX=o
LIB_SUFFIX=a LIB_SUFFIX=a
ASM_SUFFIX=s ASM_SUFFIX=s
IMPORT_LIB_SUFFIX= IMPORT_LIB_SUFFIX=
TARGET_MD_ARCH=unix
DIRENT_INO=d_ino DIRENT_INO=d_ino
MOZ_USER_DIR=".mozilla" MOZ_USER_DIR=".mozilla"
@ -1812,7 +1811,6 @@ ia64*-hpux*)
AC_DEFINE(HW_THREADS) AC_DEFINE(HW_THREADS)
AC_DEFINE(STDC_HEADERS) AC_DEFINE(STDC_HEADERS)
AC_DEFINE(WIN32_LEAN_AND_MEAN) AC_DEFINE(WIN32_LEAN_AND_MEAN)
TARGET_MD_ARCH=win32
_PLATFORM_DEFAULT_TOOLKIT='cairo-windows' _PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
BIN_SUFFIX='.exe' BIN_SUFFIX='.exe'
MOZ_USER_DIR="Mozilla" MOZ_USER_DIR="Mozilla"
@ -3704,7 +3702,6 @@ AC_SUBST(HOST_OS_ARCH)
AC_SUBST(TARGET_CPU) AC_SUBST(TARGET_CPU)
AC_SUBST(TARGET_VENDOR) AC_SUBST(TARGET_VENDOR)
AC_SUBST(TARGET_OS) AC_SUBST(TARGET_OS)
AC_SUBST(TARGET_MD_ARCH)
AC_SUBST(TARGET_XPCOM_ABI) AC_SUBST(TARGET_XPCOM_ABI)
AC_SUBST(OS_TARGET) AC_SUBST(OS_TARGET)
AC_SUBST(OS_ARCH) AC_SUBST(OS_ARCH)

View File

@ -57,7 +57,7 @@ RESOURCE_FILES.fonts += [
'mathfontUnicode.properties', 'mathfontUnicode.properties',
] ]
if CONFIG['TARGET_MD_ARCH'] == 'win32': if CONFIG['OS_TARGET'] == 'WINNT':
RESOURCE_FILES.fonts += [ RESOURCE_FILES.fonts += [
'mathfontSymbol.properties', 'mathfontSymbol.properties',
] ]