corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1479672 - Force use of gcc for hazard analysis, r=jonco

Browse Source
This commit is contained in:
Steve Fink
2018-07-05 12:40:32 -07:00
parent f6e76d239a
commit 36a614af5f
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/devtools/rootAnalysis/run_complete
View File

@@ -26,7 +26,7 @@
use strict;
use warnings;
use IO::Handle;
use File::Basename qw(dirname);
use File::Basename qw(basename dirname);
use Getopt::Long;
use Cwd;
@@ -249,13 +249,17 @@ sub run_build
# Tell the wrapper where to find the config
$ENV{"XGILL_CONFIG"} = Cwd::abs_path($config_file);
# update the PATH so that the build will see the wrappers.
# If overriding $CC, use GCCDIR to tell the wrapper scripts where the
# real compiler is. If $CC is not set, then the wrapper script will
# search $PATH anyway.
if (exists $ENV{CC}) {
$ENV{PATH} = dirname($ENV{CC}) . ":$ENV{PATH}";
delete $ENV{CC};
delete $ENV{CXX};
$ENV{GCCDIR} = dirname($ENV{CC});
}
$ENV{"PATH"} = "$wrap_dir:" . $ENV{"PATH"};
# Force the wrapper scripts to be run in place of the compiler during
# whatever build process we use.
$ENV{CC} = "$wrap_dir/" . basename($ENV{CC} // "gcc");
$ENV{CXX} = "$wrap_dir/" . basename($ENV{CXX} // "g++");
# do the build, cleaning if necessary.
chdir $build_dir;