mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 947117 - Don't tell the compiler to use debug C++ runtimes just because we're using DMD. r=glandium

This commit is contained in:
Catalin Iacob 2013-12-09 07:58:16 +01:00
Родитель 2192973715
Коммит 9dfbbd7c47
2 изменённых файлов: 8 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
config/config.mk
Просмотреть файл

@ -557,20 +557,20 @@ ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
#//------------------------------------------------------------------------ #//------------------------------------------------------------------------
ifdef USE_STATIC_LIBS ifdef USE_STATIC_LIBS
RTL_FLAGS=-MT # Statically linked multithreaded RTL RTL_FLAGS=-MT # Statically linked multithreaded RTL
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)$(MOZ_DMD)) ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
ifndef MOZ_NO_DEBUG_RTL ifndef MOZ_NO_DEBUG_RTL
RTL_FLAGS=-MTd # Statically linked multithreaded MSVC4.0 debug RTL RTL_FLAGS=-MTd # Statically linked multithreaded MSVC4.0 debug RTL
endif endif
endif # MOZ_DEBUG || NS_TRACE_MALLOC || MOZ_DMD endif # MOZ_DEBUG || NS_TRACE_MALLOC
else # !USE_STATIC_LIBS else # !USE_STATIC_LIBS
RTL_FLAGS=-MD # Dynamically linked, multithreaded RTL RTL_FLAGS=-MD # Dynamically linked, multithreaded RTL
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)$(MOZ_DMD)) ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
ifndef MOZ_NO_DEBUG_RTL ifndef MOZ_NO_DEBUG_RTL
RTL_FLAGS=-MDd # Dynamically linked, multithreaded MSVC4.0 debug RTL RTL_FLAGS=-MDd # Dynamically linked, multithreaded MSVC4.0 debug RTL
endif endif
endif # MOZ_DEBUG || NS_TRACE_MALLOC || MOZ_DMD endif # MOZ_DEBUG || NS_TRACE_MALLOC
endif # USE_STATIC_LIBS endif # USE_STATIC_LIBS
endif # WINNT && !GNU_CC endif # WINNT && !GNU_CC

8
js/src/config/config.mk
Просмотреть файл

@ -557,20 +557,20 @@ ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
#//------------------------------------------------------------------------ #//------------------------------------------------------------------------
ifdef USE_STATIC_LIBS ifdef USE_STATIC_LIBS
RTL_FLAGS=-MT # Statically linked multithreaded RTL RTL_FLAGS=-MT # Statically linked multithreaded RTL
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)$(MOZ_DMD)) ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
ifndef MOZ_NO_DEBUG_RTL ifndef MOZ_NO_DEBUG_RTL
RTL_FLAGS=-MTd # Statically linked multithreaded MSVC4.0 debug RTL RTL_FLAGS=-MTd # Statically linked multithreaded MSVC4.0 debug RTL
endif endif
endif # MOZ_DEBUG || NS_TRACE_MALLOC || MOZ_DMD endif # MOZ_DEBUG || NS_TRACE_MALLOC
else # !USE_STATIC_LIBS else # !USE_STATIC_LIBS
RTL_FLAGS=-MD # Dynamically linked, multithreaded RTL RTL_FLAGS=-MD # Dynamically linked, multithreaded RTL
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)$(MOZ_DMD)) ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
ifndef MOZ_NO_DEBUG_RTL ifndef MOZ_NO_DEBUG_RTL
RTL_FLAGS=-MDd # Dynamically linked, multithreaded MSVC4.0 debug RTL RTL_FLAGS=-MDd # Dynamically linked, multithreaded MSVC4.0 debug RTL
endif endif
endif # MOZ_DEBUG || NS_TRACE_MALLOC || MOZ_DMD endif # MOZ_DEBUG || NS_TRACE_MALLOC
endif # USE_STATIC_LIBS endif # USE_STATIC_LIBS
endif # WINNT && !GNU_CC endif # WINNT && !GNU_CC