diff --git a/browser/config/mozconfigs/win32/mingwclang b/browser/config/mozconfigs/win32/mingwclang --- a/browser/config/mozconfigs/win32/mingwclang +++ b/browser/config/mozconfigs/win32/mingwclang @@ -38,8 +38,6 @@ HOST_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++" CC="$MOZ_FETCHES_DIR/clang/bin/i686-w64-mingw32-clang" CXX="$MOZ_FETCHES_DIR/clang/bin/i686-w64-mingw32-clang++" -ac_add_options --with-clang-path="$CC" -ac_add_options --with-libclang-path="$MOZ_FETCHES_DIR/clang/lib" CXXFLAGS="-fms-extensions" CFLAGS="$CFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}" CXXFLAGS="$CXXFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}" diff --git a/browser/config/mozconfigs/win64/mingwclang b/browser/config/mozconfigs/win64/mingwclang --- a/browser/config/mozconfigs/win64/mingwclang +++ b/browser/config/mozconfigs/win64/mingwclang @@ -38,8 +38,6 @@ HOST_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++" CC="$MOZ_FETCHES_DIR/clang/bin/x86_64-w64-mingw32-clang" CXX="$MOZ_FETCHES_DIR/clang/bin/x86_64-w64-mingw32-clang++" -ac_add_options --with-clang-path="$CC" -ac_add_options --with-libclang-path="$MOZ_FETCHES_DIR/clang/lib" CXXFLAGS="-fms-extensions" CFLAGS="$CFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}" CXXFLAGS="$CXXFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}" diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix --- a/build/unix/mozconfig.unix +++ b/build/unix/mozconfig.unix @@ -7,7 +7,6 @@ # We want to make sure we use binutils and other binaries in the tooltool # package. mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH" - ac_add_options --with-clang-path=$MOZ_FETCHES_DIR/clang/bin/clang else # For some builds we don't want to have Clang based static-analysis activated if [ -z "$DISABLE_CLANG_PLUGIN" ]; then diff --git a/js/src/devtools/rootAnalysis/mozconfig.haz_shell b/js/src/devtools/rootAnalysis/mozconfig.haz_shell --- a/js/src/devtools/rootAnalysis/mozconfig.haz_shell +++ b/js/src/devtools/rootAnalysis/mozconfig.haz_shell @@ -14,5 +14,4 @@ if [ -n "$AUTOMATION" ]; then mk_add_options MOZ_OBJDIR="${HAZARD_SHELL_OBJDIR}" - ac_add_options --with-clang-path="${MOZ_FETCHES_DIR}/clang/bin/clang" fi diff --git a/js/src/devtools/rootAnalysis/mozconfig.common b/js/src/devtools/rootAnalysis/mozconfig.common --- a/js/src/devtools/rootAnalysis/mozconfig.common +++ b/js/src/devtools/rootAnalysis/mozconfig.common @@ -35,7 +35,3 @@ CFLAGS="$CFLAGS $ANALYSIS_EXTRA_CFLAGS" CPPFLAGS="$CPPFLAGS $ANALYSIS_EXTRA_CFLAGS" CXXFLAGS="$CXXFLAGS $ANALYSIS_EXTRA_CFLAGS" - -if [ -n "$AUTOMATION" ]; then - ac_add_options --with-clang-path="${MOZ_FETCHES_DIR}/clang/bin/clang" -fi