Bug 728178 - js.exe fails to link on on mingw (missing MOZ_Crash) r=glandium

This commit is contained in:
Jacek Caban 2012-03-02 11:27:29 +01:00
parent 858e539a6c
commit 01ae5b4040
2 changed files with 6 additions and 2 deletions

View File

@ -7308,7 +7308,11 @@ if test "${OS_TARGET}" = "Android"; then
:
elif test "${OS_TARGET}" = "WINNT" -o "${OS_TARGET}" = "Darwin" -o "${OS_TARGET}" = "OS2"; then
dnl On Windows, OSX and OS2, we want to link all our binaries against mozglue
MOZ_GLUE_LDFLAGS='$(call EXPAND_LIBNAME_PATH,mozglue,$(LIBXUL_DIST)/lib)'
if test -z "$GNU_CC"; then
MOZ_GLUE_LDFLAGS='$(call EXPAND_LIBNAME_PATH,mozglue,$(LIBXUL_DIST)/lib)'
else
MOZ_GLUE_LDFLAGS='-L$(LIBXUL_DIST)/lib $(call EXPAND_LIBNAME,mozglue)'
fi
else
dnl On other Unix systems, we only want to link executables against mozglue
MOZ_GLUE_PROGRAM_LDFLAGS='$(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,mozglue,$(LIBXUL_DIST)/lib) $(MKSHLIB_UNFORCE_ALL)'

View File

@ -101,7 +101,7 @@
* depending upon the compilation mode.
*/
#ifdef _WIN32
# if defined(__MWERKS__) || defined(__GNUC__)
# if defined(__MWERKS__)
# define MOZ_IMPORT_API(x) x
# else
# define MOZ_IMPORT_API(x) __declspec(dllimport) x