diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-12-16 17:00:42 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 17:00:42 (GMT) |
| commit | 640ed520dd6a43a8bf470b79542f58b5d57af9de (patch) | |
| tree | d12ba4f31fba82dda6e7da9f844204a573ec4a75 | |
| parent | f5107dfd42121ef40b13eb678705802f0ff02cf9 (diff) | |
| download | cpython-640ed520dd6a43a8bf470b79542f58b5d57af9de.zip cpython-640ed520dd6a43a8bf470b79542f58b5d57af9de.tar.gz cpython-640ed520dd6a43a8bf470b79542f58b5d57af9de.tar.bz2 | |
bpo-35499: make profile-opt don't override CFLAGS_NODIST (GH-11164)
"make profile-opt" no longer replaces CFLAGS_NODIST with CFLAGS. It
now adds profile-guided optimization (PGO) flags to CFLAGS_NODIST,
existing CFLAGS_NODIST flags are kept.
| -rw-r--r-- | Makefile.pre.in | 4 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Build/2018-12-14-19-36-05.bpo-35499.9yAldM.rst | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index f16eb96..9c790f1 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -496,7 +496,7 @@ profile-run-stamp: touch $@ build_all_generate_profile: - $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS) $(PGO_PROF_GEN_FLAG)" LDFLAGS="$(LDFLAGS) $(PGO_PROF_GEN_FLAG)" LIBS="$(LIBS)" + $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS_NODIST) $(PGO_PROF_GEN_FLAG)" LDFLAGS="$(LDFLAGS) $(PGO_PROF_GEN_FLAG)" LIBS="$(LIBS)" run_profile_task: @ # FIXME: can't run for a cross build @@ -510,7 +510,7 @@ build_all_merge_profile: profile-opt: profile-run-stamp @echo "Rebuilding with profile guided optimizations:" -rm -f profile-clean-stamp - $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS) $(PGO_PROF_USE_FLAG)" LDFLAGS="$(LDFLAGS)" + $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS_NODIST) $(PGO_PROF_USE_FLAG)" LDFLAGS="$(LDFLAGS)" # Compile and run with gcov .PHONY=coverage coverage-lcov coverage-report diff --git a/Misc/NEWS.d/next/Build/2018-12-14-19-36-05.bpo-35499.9yAldM.rst b/Misc/NEWS.d/next/Build/2018-12-14-19-36-05.bpo-35499.9yAldM.rst new file mode 100644 index 0000000..ed730b9 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2018-12-14-19-36-05.bpo-35499.9yAldM.rst @@ -0,0 +1,3 @@ +``make profile-opt`` no longer replaces ``CFLAGS_NODIST`` with ``CFLAGS``. It +now adds profile-guided optimization (PGO) flags to ``CFLAGS_NODIST``: existing +``CFLAGS_NODIST`` flags are kept. |