Build fixes: * enable RTTI by default when building with GCC to work around the tr1/functional error * link with -lrt * Tell chromium that it's always using wide wchar on Linux

This commit is contained in:
Benjamin Smedberg 2009-06-30 13:21:26 -04:00
parent e527ef540e
commit a7eaf47932
4 changed files with 6 additions and 16 deletions

View File

@ -7310,6 +7310,10 @@ dnl ========================================================
dnl C++ rtti
dnl Should be smarter and check that the compiler does indeed have rtti
dnl ========================================================
if test -n "$GNU_CC"; then
_MOZ_USE_RTTI=1
fi
MOZ_ARG_ENABLE_BOOL(cpp-rtti,
[ --enable-cpp-rtti Enable C++ RTTI ],
[ _MOZ_USE_RTTI=1 ],

View File

@ -109,7 +109,3 @@ OS_CFLAGS += $(MOZ_GTK2_CFLAGS)
endif # }
endif # }
ifdef OS_POSIX
CXXFLAGS += $(MOZ_RTTI_FLAGS_ON)
endif

View File

@ -76,19 +76,7 @@
#else // CHROMIUM_MOZILLA_BUILD
#if defined(OS_WIN)
#define WCHAR_T_IS_UTF16
#elif defined(OS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__)
#if (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff)
#define WCHAR_T_IS_UTF32
#elif (__WCHAR_MAX__ == 0x7fff || __WCHAR_MAX__ == 0xffff)
#define WCHAR_T_IS_UTF16
#endif
#endif
#if !defined(WCHAR_T_IS_UTF16) && !defined(WCHAR_T_IS_UTF32)
#error Please add support for your compiler in build/build_config.h
#endif
#endif // CHROMIUM_MOZILLA_BUILD

View File

@ -96,6 +96,8 @@ STATIC_LIBS += \
mozipc_s \
chromium_s \
$(NULL)
OS_LIBS += -lrt
endif
STATIC_LIBS += \