Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1403346 - Expand references to the objdir in old-configure. r=glandium

Browse Source 
MozReview-Commit-ID: LtReuXQwheR
This commit is contained in:
Chris Manchester 2017-10-25 15:10:04 -07:00
parent 1e2fcc4b06
commit 5c1a91facd
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/old-configure.in
View File

@ -70,6 +70,12 @@ if test -z "$JS_STANDALONE"; then
fi
AC_SUBST(autoconfmk)
if test -n "$JS_STANDALONE"; then
jsconfdefs=$_objdir/js/src/js-confdefs.h
else
jsconfdefs=$_objdir/js-confdefs.h
fi
MOZ_ANDROID_NDK
case "$target" in
@ -484,12 +490,12 @@ if test "$GNU_CC"; then
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
_DEFINES_CFLAGS='-include $(topobjdir)/js/src/js-confdefs.h -DMOZILLA_CLIENT'
_DEFINES_CFLAGS="-include $jsconfdefs -DMOZILLA_CLIENT"
_USE_CPP_INCLUDE_FLAG=1
fi
if test "$GNU_CXX"; then
_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(topobjdir)/js/src/js-confdefs.h'
_DEFINES_CXXFLAGS="-DMOZILLA_CLIENT -include $jsconfdefs"
_USE_CPP_INCLUDE_FLAG=1
fi
@ -675,8 +681,8 @@ case "$target" in
WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
DSO_LDOPTS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
_USE_CPP_INCLUDE_FLAG=1
_DEFINES_CFLAGS='-FI $(topobjdir)/js/src/js-confdefs.h -DMOZILLA_CLIENT'
_DEFINES_CXXFLAGS='-FI $(topobjdir)/js/src/js-confdefs.h -DMOZILLA_CLIENT'
_DEFINES_CFLAGS="-FI $jsconfdefs -DMOZILLA_CLIENT"
_DEFINES_CXXFLAGS="-FI $jsconfdefs -DMOZILLA_CLIENT"
CFLAGS="$CFLAGS -W3 -Gy -Zc:inline"
CXXFLAGS="$CXXFLAGS -W3 -Gy -Zc:inline"
if test "$CPU_ARCH" = "x86";then

8
old-configure.in
View File

@ -632,7 +632,7 @@ if test "$GNU_CC"; then
fi
fi
_DEFINES_CFLAGS='-include $(topobjdir)/mozilla-config.h -DMOZILLA_CLIENT'
_DEFINES_CFLAGS="-include $_objdir/mozilla-config.h -DMOZILLA_CLIENT"
_USE_CPP_INCLUDE_FLAG=1
ASFLAGS="$ASFLAGS $_DEFINES_CFLAGS"
@ -642,7 +642,7 @@ if test "$GNU_CXX"; then
# FIXME: Let us build with strict aliasing. bug 414641.
CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-strict-aliasing"
_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(topobjdir)/mozilla-config.h'
_DEFINES_CXXFLAGS="-DMOZILLA_CLIENT -include $_objdir/mozilla-config.h"
_USE_CPP_INCLUDE_FLAG=1
fi
@ -904,8 +904,8 @@ case "$target" in
WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
DSO_LDOPTS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
_USE_CPP_INCLUDE_FLAG=1
_DEFINES_CFLAGS='-FI $(topobjdir)/mozilla-config.h -DMOZILLA_CLIENT'
_DEFINES_CXXFLAGS='-FI $(topobjdir)/mozilla-config.h -DMOZILLA_CLIENT'
_DEFINES_CFLAGS="-FI $_objdir/mozilla-config.h -DMOZILLA_CLIENT"
_DEFINES_CXXFLAGS="-FI $_objdir/mozilla-config.h -DMOZILLA_CLIENT"
CFLAGS="$CFLAGS -W3 -Gy -Zc:inline"
CXXFLAGS="$CXXFLAGS -W3 -Gy -Zc:inline"
if test -z "$CLANG_CL"; then