Skip to content

Commit

Permalink
Bug 1209391 - Remove build/unix/uniq.py. r=mshal
Browse files Browse the repository at this point in the history
  • Loading branch information
glandium committed Sep 30, 2015
1 parent 93c3546 commit d72ba2a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 17 deletions.
10 changes: 0 additions & 10 deletions build/unix/uniq.py

This file was deleted.

7 changes: 1 addition & 6 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -6306,9 +6306,6 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then
fi
AC_SUBST(MOZ_GIO_COMPONENT)

dnl Remove dupes
MOZ_EXTENSIONS=`$PYTHON ${srcdir}/build/unix/uniq.py ${MOZ_EXTENSIONS}`

dnl Ensure every extension exists, to avoid mostly-inscrutable error messages
dnl when trying to build a nonexistent extension.
for extension in $MOZ_EXTENSIONS; do
Expand Down Expand Up @@ -8379,8 +8376,6 @@ MOZ_ARG_ENABLE_STRING(necko-protocols,
fi
done],
NECKO_PROTOCOLS="$NECKO_PROTOCOLS_DEFAULT")
dnl Remove dupes
NECKO_PROTOCOLS=`$PYTHON ${srcdir}/build/unix/uniq.py ${NECKO_PROTOCOLS}`
AC_SUBST_SET(NECKO_PROTOCOLS)
for p in $NECKO_PROTOCOLS; do
AC_DEFINE_UNQUOTED(NECKO_PROTOCOL_$p)
Expand Down Expand Up @@ -8564,7 +8559,7 @@ AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)
AC_SUBST(MOZ_DEBUG_DISABLE_DEFS)
AC_SUBST(MOZ_DEBUG_LDFLAGS)
AC_SUBST(WARNINGS_AS_ERRORS)
AC_SUBST(MOZ_EXTENSIONS)
AC_SUBST_SET(MOZ_EXTENSIONS)
AC_SUBST(MOZ_ENABLE_PROFILER_SPS)
AC_SUBST(MOZ_JPROF)
AC_SUBST(MOZ_INSTRUMENTS)
Expand Down
2 changes: 1 addition & 1 deletion extensions/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

DIRS += CONFIG['MOZ_EXTENSIONS'].split()
DIRS += CONFIG['MOZ_EXTENSIONS']

0 comments on commit d72ba2a

Please sign in to comment.