Skip to content

Commit

Permalink
Bug 1292066 - Move GNU make detection to python configure. r=chmanche…
Browse files Browse the repository at this point in the history
…ster

Nothing is using MAKE in old-configure, and it was not AC_SUBST'ed, so
we don't need to set it when it's not set in the environment already.

--HG--
extra : rebase_source : 9a525517808db87add72989ab9f43a135c0cc776
  • Loading branch information
glandium committed Aug 4, 2016
1 parent 6df9c96 commit 1cd034b
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 54 deletions.
27 changes: 0 additions & 27 deletions js/src/old-configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -377,33 +377,6 @@ tools are selected during the Xcode/Developer Tools installation.])
fi
fi

fi # COMPILE_ENVIRONMENT

if test -n "$MAKE"; then
if test `echo $MAKE | grep -c make.py` != 1; then
NOT_PYMAKE=$MAKE
fi
fi

case "$host_os" in
mingw*)
MOZ_PATH_PROGS(GMAKE, $GMAKE mingw32-make $NOT_PYMAKE make gmake, :)
;;
*)
MOZ_PATH_PROGS(GMAKE, $GMAKE $NOT_PYMAKE gmake make, :)
;;
esac
if test "$GMAKE" = ":"; then
AC_MSG_ERROR([GNU make not found])
fi

# MAKE will be set by client.mk, but still need this for standalone js builds
if test -z "$MAKE"; then
MAKE=$GMAKE
fi

if test "$COMPILE_ENVIRONMENT"; then

AC_PATH_XTRA

XCFLAGS="$X_CFLAGS"
Expand Down
19 changes: 19 additions & 0 deletions moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,25 @@ def perl_version_check(min_version):
perl_version_check('5.006')


# GNU make detection
# ==============================================================
option(env='MAKE', nargs=1, help='Path to GNU make')

@depends('MAKE', host)
def possible_makes(make, host):
candidates = []
if host.kernel == 'WINNT':
candidates.append('mingw32-make')
if make:
candidates.append(make[0])
if host.kernel == 'WINNT':
candidates.extend(('make', 'gmake'))
else:
candidates.extend(('gmake', 'make'))
return candidates

check_prog('GMAKE', possible_makes)

# Miscellaneous programs
# ==============================================================
check_prog('DOXYGEN', ('doxygen',), allow_missing=True)
Expand Down
27 changes: 0 additions & 27 deletions old-configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -567,33 +567,6 @@ tools are selected during the Xcode/Developer Tools installation.])
fi
fi

fi # COMPILE_ENVIRONMENT

if test -n "$MAKE"; then
if test `echo $MAKE | grep -c make.py` != 1; then
NOT_PYMAKE=$MAKE
fi
fi

case "$host_os" in
mingw*)
MOZ_PATH_PROGS(GMAKE, $GMAKE mingw32-make $NOT_PYMAKE make gmake, :)
;;
*)
MOZ_PATH_PROGS(GMAKE, $GMAKE $NOT_PYMAKE gmake make, :)
;;
esac
if test "$GMAKE" = ":"; then
AC_MSG_ERROR([GNU make not found])
fi
AC_SUBST(GMAKE)

if test -z "$MAKE"; then
MAKE=$GMAKE
fi

if test "$COMPILE_ENVIRONMENT"; then

AC_PATH_XTRA

XCFLAGS="$X_CFLAGS"
Expand Down

0 comments on commit 1cd034b

Please sign in to comment.