Reland of build: Prepare for building clang without ENABLE_LINKER_BUILD_ID=ON (patchset #1 id:1 of https://codereview.chromium.org/2754973002/ )

Reason for revert:
pnacl should no longer complain about this switch.

Original issue's description:
> Revert of build: Prepare for building clang without ENABLE_LINKER_BUILD_ID=ON (patchset #1 id:1 of https://codereview.chromium.org/2756713002/ )
>
> Reason for revert:
> Still breaks pnacl-ld on Windows: https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.chrome%2FGoogle_Chrome_Win%2F16241%2F%2B%2Frecipes%2Fsteps%2Fcompile%2F0%2Fstdout
> pnacl-ld: "--build-id=sha1" affects translation. To allow, specify --pnacl-allow-native
>
>
> Original issue's description:
> > Reland of build: Prepare for building clang without ENABLE_LINKER_BUILD_ID=ON (patchset #1 id:1 of https://codereview.chromium.org/2732023004/ )
> >
> > Reason for revert:
> > With https://bugs.chromium.org/p/nativeclient/issues/detail?id=4391#c1 fixed, this might now work.
> >
> > Original issue's description:
> > > Revert of build: Prepare for building clang without ENABLE_LINKER_BUILD_ID=ON (patchset #2 id:20001 of https://codereview.chromium.org/2732293002/ )
> > >
> > > Reason for revert:
> > > https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20ChromeOS/builds/30394/steps/compile/logs/stdio
> > >
> > > pnacl-ld: Unrecognized option: --build-id=sha1
> > >
> > > gn args:
> > > goma_dir = "/b/c/goma_client"
> > > is_chrome_branded = true
> > > is_debug = false
> > > is_official_build = true
> > > target_os = "chromeos"
> > > use_goma = true
> > >
> > > Original issue's description:
> > > > build: Prepare for building clang without ENABLE_LINKER_BUILD_ID=ON
> > > >
> > > > BUG=622775
> > > >
> > > > Review-Url: https://codereview.chromium.org/2732293002
> > > > Cr-Commit-Position: refs/heads/master@{#455154}
> > > > Committed: 4e5c4a1545
> > >
> > > TBR=hans@chromium.org,torne@chromium.org,mcgrathr@chromium.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=622775
> > >
> > > Review-Url: https://codereview.chromium.org/2732023004
> > > Cr-Commit-Position: refs/heads/master@{#455172}
> > > Committed: e806d46df5
> >
> > TBR=hans@chromium.org,torne@chromium.org,mcgrathr@chromium.org
> > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > BUG=622775
> >
> > Review-Url: https://codereview.chromium.org/2756713002
> > Cr-Commit-Position: refs/heads/master@{#457493}
> > Committed: c3cb7d84db
>
> TBR=hans@chromium.org,torne@chromium.org,mcgrathr@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=622775
>
> Review-Url: https://codereview.chromium.org/2754973002
> Cr-Commit-Position: refs/heads/master@{#457523}
> Committed: c9650610e0

TBR=hans@chromium.org,torne@chromium.org,mcgrathr@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=622775

Review-Url: https://codereview.chromium.org/2790473005 .
Cr-Original-Commit-Position: refs/heads/master@{#461188}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 1bafcfdfcc6867b9be120e54c73b0ea526cd886e
This commit is contained in:
Nico Weber 2017-03-31 15:48:18 -04:00
Родитель 778b337ee7
Коммит 362f572ab6
2 изменённых файлов: 10 добавлений и 1 удалений

Просмотреть файл

@ -39,7 +39,6 @@ config("compiler") {
}
ldflags = [
"-Wl,--build-id=sha1",
"-Wl,--no-undefined",
# Don't allow visible symbols from libgcc or libc++ to be

Просмотреть файл

@ -270,6 +270,16 @@ config("compiler") {
}
}
if (is_official_build) {
# Explicitly pass --build-id to ld. Compilers used to always pass this
# implicitly but don't any more (in particular clang when built without
# ENABLE_LINKER_BUILD_ID=ON). The crash infrastructure does need a build
# id, so explicitly enable it in official builds. It's not needed in
# unofficial builds and computing it does slow down the link, so go with
# faster links in unofficial builds.
ldflags += [ "-Wl,--build-id=sha1" ]
}
defines += [ "_FILE_OFFSET_BITS=64" ]
if (!is_android) {