diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2015-11-28 19:05:47 +0100 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2015-11-30 10:18:32 +0100 |
| commit | 8cfc51a5a65110129a323aec57f2032b1e3bb466 (patch) | |
| tree | a4281536cf2ea86c35d5469aacb5bf33945aebe0 | |
| parent | 0476a094113c0a8d3f2d6ab7d0108688926882bb (diff) | |
Move running GCC's "gcc_update --touch" script from "build" to "checkout"
This will avoid non-deterministic build behavior and will fix _Pragma3.c test.
At the moment gcc_update will run only when GCC is checked out from VC repo,
and we need it to also run for building from tarballs.
Change-Id: I04268bacff5ba5f6a647e4bcfd7c79b606e87067
| -rw-r--r-- | lib/checkout.sh | 6 | ||||
| -rwxr-xr-x | lib/make.sh | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/lib/checkout.sh b/lib/checkout.sh index 5299b706..30c7b824 100644 --- a/lib/checkout.sh +++ b/lib/checkout.sh @@ -405,6 +405,12 @@ checkout() return 1 fi + if test -e ${srcdir}/contrib/gcc_update; then + # Touch GCC's auto-generated files to avoid non-deterministic + # build behavior. + dryrun "(cd ${srcdir} && ./contrib/gcc_update --touch)" + fi + return 0 } diff --git a/lib/make.sh b/lib/make.sh index 3bec3b33..923fe5c0 100755 --- a/lib/make.sh +++ b/lib/make.sh @@ -357,18 +357,6 @@ build() if test $? -gt 0; then warning "Sources not updated, network error!" fi - # Before building GCC, call contrib/gcc_update such that - # time stamps are as expected. Otherwise, we could have - # false failures in the testsuite (such as - # gcc.dg/cpp/_Pragma3.c see - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=28123) - case ${tool} in - gcc) - (cd ${srcdir} ; ./contrib/gcc_update --touch) - ;; - *) - ;; - esac else # Don't update the compiler sources between stage1 and stage2 builds if this # is a cross build. |