Clean up automated build infra mozconfigs

18 files changed, 0 insertions, 379 deletions

diff --git a/build/macosx/cross-mozconfig.common b/build/macosx/cross-mozconfig.common
deleted file mode 100644
index 8e56394d0..000000000
--- a/build/macosx/cross-mozconfig.common
+++ /dev/null
@@ -1,47 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOZ_AUTOMATION_L10N_CHECK=0
-
-if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  # Some nightlies (eg: Mulet) don't want these set.
-  MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
-  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-fi
-. "$topsrcdir/build/mozconfig.common"
-
-# ld needs libLTO.so from llvm
-mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib"
-
-CROSS_CCTOOLS_PATH=$topsrcdir/cctools
-CROSS_SYSROOT=$topsrcdir/MacOSX10.7.sdk
-CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks
-FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT"
-
-export CC="$topsrcdir/clang/bin/clang $FLAGS"
-export CXX="$topsrcdir/clang/bin/clang++ $FLAGS"
-export CPP="$topsrcdir/clang/bin/clang $FLAGS -E"
-export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
-export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"
-export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10-
-export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
-export GENISOIMAGE=$topsrcdir/genisoimage/genisoimage
-export DMG_TOOL=$topsrcdir/dmg/dmg
-
-export HOST_CC="$topsrcdir/clang/bin/clang"
-export HOST_CXX="$topsrcdir/clang/bin/clang++"
-export HOST_CPP="$topsrcdir/clang/bin/clang -E"
-export HOST_CFLAGS="-g"
-export HOST_CXXFLAGS="-g"
-export HOST_LDFLAGS="-g"
-
-ac_add_options --target=x86_64-apple-darwin
-ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
-
-# Enable static analysis checks by default on OSX cross builds.
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/mozconfig.cache"
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
diff --git a/build/macosx/local-mozconfig.common b/build/macosx/local-mozconfig.common
deleted file mode 100644
index 02a09d2fe..000000000
--- a/build/macosx/local-mozconfig.common
+++ /dev/null
@@ -1,46 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  # Some nightlies (eg: Mulet) don't want these set.
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
-  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-fi
-. "$topsrcdir/build/mozconfig.common"
-
-if [ -d "$topsrcdir/clang" ]; then
-    # mozilla-central based build
-    export CC=$topsrcdir/clang/bin/clang
-    export CXX=$topsrcdir/clang/bin/clang++
-    export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
-    export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
-    # Use an updated linker.
-    ldflags="-B$topsrcdir/cctools/bin"
-elif [ -d "$topsrcdir/../clang" ]; then
-    # comm-central based build
-    export CC=$topsrcdir/../clang/bin/clang
-    export CXX=$topsrcdir/../clang/bin/clang++
-    export LLVMCONFIG=$topsrcdir/../clang/bin/llvm-config
-    export DSYMUTIL=$topsrcdir/../clang/bin/llvm-dsymutil
-    # Use an updated linker.
-    ldflags="-B$topsrcdir/../cctools/bin"
-fi
-
-# Ensure the updated linker doesn't generate things our older build tools
-# don't understand.
-ldflags="$ldflags -Wl,-no_data_in_code_info"
-export LDFLAGS="$ldflags"
-
-# If not set use the system default clang
-if [ -z "$CC" ]; then
-    export CC=clang
-fi
-
-# If not set use the system default clang++
-if [ -z "$CXX" ]; then
-    export CXX=clang++
-fi
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
diff --git a/build/macosx/mozconfig.common b/build/macosx/mozconfig.common
deleted file mode 100644
index 27634b7f3..000000000
--- a/build/macosx/mozconfig.common
+++ /dev/null
@@ -1,5 +0,0 @@
-if test `uname -s` = Linux; then
-  . $topsrcdir/build/macosx/cross-mozconfig.common
-else
-  . $topsrcdir/build/macosx/local-mozconfig.common
-fi
diff --git a/build/macosx/universal/check-sync-exceptions b/build/macosx/universal/check-sync-exceptions
deleted file mode 100644
index fc5149281..000000000
--- a/build/macosx/universal/check-sync-exceptions
+++ /dev/null
@@ -1,9 +0,0 @@
-flight.mk
-mozconfig.common
-
-# Ignore detritus left lying around by editing tools.
-*~
-.#*
-#*#
-*.orig
-*.rej
diff --git a/build/macosx/universal/flight.mk b/build/macosx/universal/flight.mk
deleted file mode 100644
index 2b79ef7ae..000000000
--- a/build/macosx/universal/flight.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-# BE CAREFUL!  This makefile handles a postflight_all rule for a
-# multi-project build, so DON'T rely on anything that might differ between
-# the two OBJDIRs.
-
-ifndef OBJDIR
-OBJDIR_ARCH_1 = $(MOZ_OBJDIR)/$(firstword $(MOZ_BUILD_PROJECTS))
-OBJDIR_ARCH_2 = $(MOZ_OBJDIR)/$(word 2,$(MOZ_BUILD_PROJECTS))
-DIST_ARCH_1 = $(OBJDIR_ARCH_1)/dist
-DIST_ARCH_2 = $(OBJDIR_ARCH_2)/dist
-DIST_UNI = $(DIST_ARCH_1)/universal
-OBJDIR = $(OBJDIR_ARCH_1)
-endif
-
-topsrcdir = $(TOPSRCDIR)
-DEPTH = $(OBJDIR)
-include $(OBJDIR)/config/autoconf.mk
-
-core_abspath = $(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1))
-
-DIST = $(OBJDIR)/dist
-
-postflight_all:
-	mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
-	rm -f $(DIST_ARCH_2)/universal
-	ln -s $(abspath $(DIST_UNI)) $(DIST_ARCH_2)/universal
-# Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1
-# actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.
-	$(MAKE) -C $(OBJDIR_ARCH_1)/$(subst ../,,$(MOZ_BUILD_APP))/installer \
-	   PKG_SKIP_STRIP=1 stage-package
diff --git a/build/macosx/universal/mozconfig b/build/macosx/universal/mozconfig
deleted file mode 100644
index 32ab66f2d..000000000
--- a/build/macosx/universal/mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-# i386/x86-64 Universal Build mozconfig
-
-# As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
-# to gcc's -arch parameter.
-mk_add_options MOZ_BUILD_PROJECTS="x86_64 i386"
-
-. $topsrcdir/build/macosx/universal/mozconfig.common
diff --git a/build/macosx/universal/mozconfig.common b/build/macosx/universal/mozconfig.common
deleted file mode 100644
index 518274b51..000000000
--- a/build/macosx/universal/mozconfig.common
+++ /dev/null
@@ -1,54 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-mk_add_options MOZ_UNIFY_BDATE=1
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=build/macosx/universal/flight.mk
-
-DARWIN_VERSION=`uname -r`
-ac_add_app_options i386 --target=i386-apple-darwin$DARWIN_VERSION
-ac_add_app_options x86_64 --target=x86_64-apple-darwin$DARWIN_VERSION
-ac_add_app_options i386 --with-unify-dist=../x86_64/dist
-ac_add_app_options x86_64 --with-unify-dist=../i386/dist
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.7.sdk
-
-. $topsrcdir/build/macosx/mozconfig.common
-
-# $MOZ_BUILD_APP is only defined when sourced by configure.  That's not a
-# problem, because the variables it affects only need to be set for
-# configure.
-if test -n "$MOZ_BUILD_APP" ; then
-if test "$MOZ_BUILD_APP" = "i386" -o "$MOZ_BUILD_APP" = "x86_64"; then
-  TARGET_CPU=$MOZ_BUILD_APP
-
-  # $HOST_CXX is presently unused.  $HOST_CC will only be used during a cross
-  # compile.
-  HOST_CC=$CC
-  HOST_CXX=$CXX
-
-  NATIVE_CPU=`$topsrcdir/build/autoconf/config.guess | cut -f1 -d-`
-
-  # It's not strictly necessary to specify -arch during native builds, but it
-  # makes the merged about:buildconfig easier to follow, and it reduces
-  # conditionalized differences between builds.
-  CC="$CC -arch $TARGET_CPU"
-  CXX="$CXX -arch $TARGET_CPU"
-
-  # These must be set for cross builds, and don't hurt straight builds.
-  RANLIB=ranlib
-  AR=ar
-  AS=$CC
-  LD=ld
-  STRIP="strip"
-  OTOOL="otool"
-
-  # Each per-CPU build should be entirely oblivious to the fact that a
-  # universal binary will be produced.  The exception is packager.mk, which
-  # needs to know to look for universal bits when building the .dmg.
-  UNIVERSAL_BINARY=1
-
-  export CC CXX HOST_CC HOST_CXX RANLIB AR AS LD STRIP OTOOL
-fi
-fi
diff --git a/build/mozconfig.rust b/build/mozconfig.rust
deleted file mode 100644
index 65177a6bd..000000000
--- a/build/mozconfig.rust
+++ /dev/null
@@ -1,10 +0,0 @@
-# Options to enable rust in automation builds.
-
-# Tell configure to use the tooltool rustc.
-# Assume this is compiled with --enable-rpath so we don't
-# have to set LD_LIBRARY_PATH.
-RUSTC="$topsrcdir/rustc/bin/rustc"
-CARGO="$topsrcdir/cargo/bin/cargo"
-
-# Enable rust in the build.
-ac_add_options --enable-rust
diff --git a/build/mozconfig.vs-common b/build/mozconfig.vs-common
deleted file mode 100644
index ca5df2f3a..000000000
--- a/build/mozconfig.vs-common
+++ /dev/null
@@ -1,4 +0,0 @@
-# Pymake needs Windows-style paths. Use cmd.exe to hack around this.

-mk_export_correct_style() {

-  mk_add_options "export $1=$(cmd.exe //c echo %$1%)"

-}

diff --git a/build/mozconfig.win-common b/build/mozconfig.win-common
deleted file mode 100644
index 6e25b7ce4..000000000
--- a/build/mozconfig.win-common
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  # Some nightlies (eg: Mulet) don't want these set.
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
-  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-fi
-
-# Some builds (eg: Mulet) don't want the installer, so only set this if it
-# hasn't already been set.
-MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-1}
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token
diff --git a/build/unix/mozconfig.gtk b/build/unix/mozconfig.gtk
deleted file mode 100644
index 6f535f8a7..000000000
--- a/build/unix/mozconfig.gtk
+++ /dev/null
@@ -1,28 +0,0 @@
-# To do try builds with Gtk+2, uncomment the following line, and remove
-# everything after that.
-#ac_add_options --enable-default-toolkit=cairo-gtk2
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
-# $TOOLTOOL_DIR/gtk3 comes from tooltool, and must be included in the tooltool manifest.
-if [ -z "$PKG_CONFIG_LIBDIR" ]; then
-  echo PKG_CONFIG_LIBDIR must be set >&2
-  exit 1
-fi
-export PKG_CONFIG_SYSROOT_DIR="$TOOLTOOL_DIR/gtk3"
-export PKG_CONFIG_PATH="$TOOLTOOL_DIR/gtk3/usr/local/lib/pkgconfig"
-PKG_CONFIG="$TOOLTOOL_DIR/gtk3/usr/local/bin/pkg-config"
-export PATH="$TOOLTOOL_DIR/gtk3/usr/local/bin:${PATH}"
-# Ensure cairo, gdk-pixbuf, etc. are not taken from the system installed packages.
-LDFLAGS="-L$TOOLTOOL_DIR/gtk3/usr/local/lib ${LDFLAGS}"
-ac_add_options --enable-default-toolkit=cairo-gtk3
-
-# Set things up to use Gtk+3 from the tooltool package
-mk_add_options "export FONTCONFIG_PATH=$TOOLTOOL_DIR/gtk3/usr/local/etc/fonts"
-mk_add_options "export PANGO_SYSCONFDIR=$TOOLTOOL_DIR/gtk3/usr/local/etc"
-mk_add_options "export PANGO_LIBDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib"
-mk_add_options "export GDK_PIXBUF_MODULE_FILE=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-mk_add_options "export GDK_PIXBUF_MODULEDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders"
-
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/gtk3/usr/local/lib
-mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
diff --git a/build/unix/mozconfig.linux b/build/unix/mozconfig.linux
deleted file mode 100644
index f63f406e6..000000000
--- a/build/unix/mozconfig.linux
+++ /dev/null
@@ -1,38 +0,0 @@
-if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  # Some nightlies (eg: Mulet) don't want these set.
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
-  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-fi
-
-. "$topsrcdir/build/mozconfig.common"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
-# some b2g desktop builds still happen on i686 machines, and the tooltool
-# toolchain is x86_64 only.
-# We also deal with valgrind builds here, they don't use tooltool manifests at
-# all yet.
-if [ -z "$no_tooltool" ]
-then
-  CC="$TOOLTOOL_DIR/gcc/bin/gcc"
-  CXX="$TOOLTOOL_DIR/gcc/bin/g++"
-
-  # We want to make sure we use binutils and other binaries in the tooltool
-  # package.
-  mk_add_options PATH="$TOOLTOOL_DIR/gcc/bin:$PATH"
-else
-  CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
-  CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
-fi
-
-ac_add_options --enable-elf-hack
-
-. "$topsrcdir/build/unix/mozconfig.stdcxx"
-
-# PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
-
-. "$topsrcdir/build/unix/mozconfig.gtk"
diff --git a/build/unix/mozconfig.linux32 b/build/unix/mozconfig.linux32
deleted file mode 100644
index 309767751..000000000
--- a/build/unix/mozconfig.linux32
+++ /dev/null
@@ -1,12 +0,0 @@
-. "$topsrcdir/build/unix/mozconfig.linux"
-
-export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-
-if test `uname -m` = "x86_64"; then
-  # -march=pentiumpro is what our 32-bit native toolchain defaults to
-  CC="$CC -m32 -march=pentiumpro"
-  CXX="$CXX -m32 -march=pentiumpro"
-  ac_add_options --target=i686-pc-linux
-  ac_add_options --host=i686-pc-linux
-  ac_add_options --x-libraries=/usr/lib
-fi
diff --git a/build/unix/mozconfig.stdcxx b/build/unix/mozconfig.stdcxx
deleted file mode 100644
index 787e9b443..000000000
--- a/build/unix/mozconfig.stdcxx
+++ /dev/null
@@ -1,15 +0,0 @@
-# Avoid dependency on libstdc++ 4.7
-ac_add_options --enable-stdcxx-compat
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
-if [ -f "$TOOLTOOL_DIR/clang/lib/libstdc++.so" ]; then
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/clang/lib
-elif [ -f "$TOOLTOOL_DIR/gcc/lib/libstdc++.so" ]; then
-  # We put both 32-bits and 64-bits library path in LD_LIBRARY_PATH: ld.so
-  # will prefer the files in the 32-bits path when loading 32-bits executables,
-  # and the files in the 64-bits path when loading 64-bits executables.
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/gcc/lib64:$TOOLTOOL_DIR/gcc/lib
-fi
-
-mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
diff --git a/build/win32/mozconfig.vs-latest b/build/win32/mozconfig.vs-latest
deleted file mode 100644
index 9c8726a8d..000000000
--- a/build/win32/mozconfig.vs-latest
+++ /dev/null
@@ -1 +0,0 @@
-. $topsrcdir/build/win32/mozconfig.vs2015-win64
diff --git a/build/win32/mozconfig.vs2015-win64 b/build/win32/mozconfig.vs2015-win64
deleted file mode 100644
index b81afa681..000000000
--- a/build/win32/mozconfig.vs2015-win64
+++ /dev/null
@@ -1,25 +0,0 @@
-if [ -z "${VSPATH}" ]; then
-    TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-    VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u3"
-fi
-
-VSWINPATH="$(cd ${VSPATH} && pwd -W)"
-
-export WINDOWSSDKDIR="${VSWINPATH}/SDK"
-export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT"
-export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86"
-
-export PATH="${VSPATH}/VC/bin/amd64_x86:${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x86:${VSPATH}/SDK/bin/x64:${VSPATH}/DIA SDK/bin:${PATH}"
-export PATH="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x86:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${PATH}"
-
-export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.14393.0/ucrt:${VSPATH}/SDK/Include/10.0.14393.0/shared:${VSPATH}/SDK/Include/10.0.14393.0/um:${VSPATH}/SDK/Include/10.0.14393.0/winrt:${VSPATH}/DIA SDK/include"
-export LIB="${VSPATH}/VC/lib:${VSPATH}/VC/atlmfc/lib:${VSPATH}/SDK/lib/10.0.14393.0/ucrt/x86:${VSPATH}/SDK/lib/10.0.14393.0/um/x86:${VSPATH}/DIA SDK/lib"
-
-. $topsrcdir/build/mozconfig.vs-common
-
-mk_export_correct_style WINDOWSSDKDIR
-mk_export_correct_style INCLUDE
-mk_export_correct_style LIB
-mk_export_correct_style PATH
-mk_export_correct_style WIN32_REDIST_DIR
-mk_export_correct_style WIN_UCRT_REDIST_DIR
diff --git a/build/win64/mozconfig.vs-latest b/build/win64/mozconfig.vs-latest
deleted file mode 100644
index 3470d4ace..000000000
--- a/build/win64/mozconfig.vs-latest
+++ /dev/null
@@ -1 +0,0 @@
-. $topsrcdir/build/win64/mozconfig.vs2015
diff --git a/build/win64/mozconfig.vs2015 b/build/win64/mozconfig.vs2015
deleted file mode 100644
index e81a00064..000000000
--- a/build/win64/mozconfig.vs2015
+++ /dev/null
@@ -1,24 +0,0 @@
-if [ -z "${VSPATH}" ]; then
-    TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-    VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u3"
-fi
-
-VSWINPATH="$(cd ${VSPATH} && pwd -W)"
-
-export WINDOWSSDKDIR="${VSWINPATH}/SDK"
-export WIN32_REDIST_DIR=${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT
-export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64"
-
-export PATH="${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x64:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${VSPATH}/DIA SDK/bin/amd64:${PATH}"
-
-export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.14393.0/ucrt:${VSPATH}/SDK/Include/10.0.14393.0/shared:${VSPATH}/SDK/Include/10.0.14393.0/um:${VSPATH}/SDK/Include/10.0.14393.0/winrt:${VSPATH}/DIA SDK/include"
-export LIB="${VSPATH}/VC/lib/amd64:${VSPATH}/VC/atlmfc/lib/amd64:${VSPATH}/SDK/lib/10.0.14393.0/ucrt/x64:${VSPATH}/SDK/lib/10.0.14393.0/um/x64:${VSPATH}/DIA SDK/lib/amd64"
-
-. $topsrcdir/build/mozconfig.vs-common
-
-mk_export_correct_style WINDOWSSDKDIR
-mk_export_correct_style INCLUDE
-mk_export_correct_style LIB
-mk_export_correct_style PATH
-mk_export_correct_style WIN32_REDIST_DIR
-mk_export_correct_style WIN_UCRT_REDIST_DIR