1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent 855b1f176633af8ae11c0d791c8b33e9a2ae88e0 |
3 # Parent d6f551c7b3dc20bb47526e06c44646fd159f3dd1 |
4 |
4 |
5 diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure |
5 diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure |
6 --- a/build/moz.configure/lto-pgo.configure |
6 --- a/build/moz.configure/lto-pgo.configure |
7 +++ b/build/moz.configure/lto-pgo.configure |
7 +++ b/build/moz.configure/lto-pgo.configure |
8 @@ -242,34 +242,34 @@ def lto( |
8 @@ -242,34 +242,34 @@ def lto( |
131 if [ -n "$FORCE_GCC" ]; then |
131 if [ -n "$FORCE_GCC" ]; then |
132 CC="$MOZ_FETCHES_DIR/gcc/bin/gcc" |
132 CC="$MOZ_FETCHES_DIR/gcc/bin/gcc" |
133 CXX="$MOZ_FETCHES_DIR/gcc/bin/g++" |
133 CXX="$MOZ_FETCHES_DIR/gcc/bin/g++" |
134 |
134 |
135 + if [ -n "$MOZ_PGO" ]; then |
135 + if [ -n "$MOZ_PGO" ]; then |
136 + if [ -z "$USE_ARTIFACT" ]; then |
136 + if [ -z "$USE_ARTIFACT" ]; then |
137 + ac_add_options --enable-lto |
137 + ac_add_options --enable-lto |
138 + fi |
138 + fi |
139 + export AR="$topsrcdir/gcc/bin/gcc-ar" |
139 + export AR="$topsrcdir/gcc/bin/gcc-ar" |
140 + export NM="$topsrcdir/gcc/bin/gcc-nm" |
140 + export NM="$topsrcdir/gcc/bin/gcc-nm" |
141 + export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib" |
141 + export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib" |
142 + fi |
142 + fi |
143 + |
143 + |
144 # We want to make sure we use binutils and other binaries in the tooltool |
144 # We want to make sure we use binutils and other binaries in the tooltool |
145 # package. |
145 # package. |
146 mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH" |
146 mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$MOZ_FETCHES_DIR/binutils/bin:$PATH" |
147 else |
147 else |
148 # For some builds we don't want to have Clang based static-analysis activated |
148 # For some builds we don't want to have Clang based static-analysis activated |
149 if [ -z "$DISABLE_CLANG_PLUGIN" ]; then |
149 if [ -z "$DISABLE_CLANG_PLUGIN" ]; then |
150 export ENABLE_CLANG_PLUGIN=1 |
150 export ENABLE_CLANG_PLUGIN=1 |
151 fi |
151 fi |