1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent 41df71ef2798d6bd6a67cfc4c4f26b8d41b8ccca |
3 # Parent 07b5ae8ccc4806fcc5ad74e32a2d3fb2b9d605d0 |
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 @@ -235,23 +235,23 @@ def lto( |
8 @@ -235,23 +235,23 @@ def lto( |
112 % os.getcwd() |
112 % os.getcwd() |
113 ) |
113 ) |
114 diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix |
114 diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix |
115 --- a/build/unix/mozconfig.unix |
115 --- a/build/unix/mozconfig.unix |
116 +++ b/build/unix/mozconfig.unix |
116 +++ b/build/unix/mozconfig.unix |
117 @@ -1,16 +1,25 @@ |
117 @@ -1,14 +1,23 @@ |
118 . "$topsrcdir/build/mozconfig.common" |
118 . "$topsrcdir/build/mozconfig.common" |
119 |
|
120 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir} |
|
121 |
119 |
122 if [ -n "$FORCE_GCC" ]; then |
120 if [ -n "$FORCE_GCC" ]; then |
123 CC="$MOZ_FETCHES_DIR/gcc/bin/gcc" |
121 CC="$MOZ_FETCHES_DIR/gcc/bin/gcc" |
124 CXX="$MOZ_FETCHES_DIR/gcc/bin/g++" |
122 CXX="$MOZ_FETCHES_DIR/gcc/bin/g++" |
125 |
123 |
126 + if [ -n "$MOZ_PGO" ]; then |
124 + if [ -n "$MOZ_PGO" ]; then |
127 + if [ -z "$USE_ARTIFACT" ]; then |
125 + if [ -z "$USE_ARTIFACT" ]; then |
128 + ac_add_options --enable-lto |
126 + ac_add_options --enable-lto |
129 + fi |
127 + fi |
130 + export AR="$topsrcdir/gcc/bin/gcc-ar" |
128 + export AR="$topsrcdir/gcc/bin/gcc-ar" |
131 + export NM="$topsrcdir/gcc/bin/gcc-nm" |
129 + export NM="$topsrcdir/gcc/bin/gcc-nm" |
132 + export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib" |
130 + export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib" |
133 + fi |
131 + fi |
134 + |
132 + |
135 # We want to make sure we use binutils and other binaries in the tooltool |
133 # We want to make sure we use binutils and other binaries in the tooltool |
136 # package. |
134 # package. |
137 mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH" |
135 mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH" |
138 ac_add_options --with-clang-path=$MOZ_FETCHES_DIR/clang/bin/clang |
|
139 else |
136 else |
140 CC="$MOZ_FETCHES_DIR/clang/bin/clang" |
137 # For some builds we don't want to have Clang based static-analysis activated |
141 CXX="$MOZ_FETCHES_DIR/clang/bin/clang++" |
138 if [ -z "$DISABLE_CLANG_PLUGIN" ]; then |
142 |
139 export ENABLE_CLANG_PLUGIN=1 |
|
140 fi |
143 diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build |
141 diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build |
144 --- a/extensions/spellcheck/src/moz.build |
142 --- a/extensions/spellcheck/src/moz.build |
145 +++ b/extensions/spellcheck/src/moz.build |
143 +++ b/extensions/spellcheck/src/moz.build |
146 @@ -26,8 +26,10 @@ LOCAL_INCLUDES += [ |
144 @@ -26,8 +26,10 @@ LOCAL_INCLUDES += [ |
147 ] |
145 ] |