| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 7fd121bb7d6c25c2e0a1c31cf76fb9bd4a9794de Mon Sep 17 00:00:00 2001 |
| 2 | From: Markus Lehtonen <markus.lehtonen@linux.intel.com> |
| 3 | Date: Tue, 14 Aug 2018 14:11:35 +0800 |
| 4 | Subject: [PATCH 1/2] Use correct CFLAGS for extensions when cross-compiling |
| 5 | |
| 6 | Take PY_CFLAGS_NODIST into account, like in native build. This is needed |
| 7 | in order to to profile-optimized build. Also, pass EXTRA_CFLAGS to |
| 8 | profile-optimized build. |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> |
| 13 | --- |
| 14 | Makefile.pre.in | 4 ++-- |
| 15 | setup.py | 3 ++- |
| 16 | 2 files changed, 4 insertions(+), 3 deletions(-) |
| 17 | |
| 18 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
| 19 | index e2d5d3d..84bc3ff 100644 |
| 20 | --- a/Makefile.pre.in |
| 21 | +++ b/Makefile.pre.in |
| 22 | @@ -478,7 +478,7 @@ profile-opt: |
| 23 | $(MAKE) profile-removal |
| 24 | |
| 25 | build_all_generate_profile: |
| 26 | - $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS) $(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LDFLAGS="$(LDFLAGS) $(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LIBS="$(LIBS)" |
| 27 | + $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS) $(EXTRA_CFLAGS) $(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LDFLAGS="$(LDFLAGS) $(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LIBS="$(LIBS)" |
| 28 | |
| 29 | run_profile_task: |
| 30 | : # FIXME: can't run for a cross build |
| 31 | @@ -488,7 +488,7 @@ build_all_merge_profile: |
| 32 | $(LLVM_PROF_MERGER) |
| 33 | |
| 34 | build_all_use_profile: |
| 35 | - $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS) $(PGO_PROF_USE_FLAG) @LTOFLAGS@" LDFLAGS="$(LDFLAGS) @LTOFLAGS@" |
| 36 | + $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS) $(EXTRA_CFLAGS) $(PGO_PROF_USE_FLAG) @LTOFLAGS@" LDFLAGS="$(LDFLAGS) @LTOFLAGS@" |
| 37 | |
| 38 | # Compile and run with gcov |
| 39 | .PHONY=coverage coverage-lcov coverage-report |
| 40 | diff --git a/setup.py b/setup.py |
| 41 | index add3346..65e83b1 100644 |
| 42 | --- a/setup.py |
| 43 | +++ b/setup.py |
| 44 | @@ -263,7 +263,8 @@ class PyBuildExt(build_ext): |
| 45 | # compilers |
| 46 | if compiler is not None: |
| 47 | if cross_compiling: |
| 48 | - (ccshared,cflags) = (os.environ.get('CCSHARED') or '', os.environ.get('CFLAGS') or '') |
| 49 | + (ccshared,cflags) = (os.environ.get('CCSHARED') or '', |
| 50 | + (os.environ.get('CFLAGS') or '') + ' ' + sysconfig.get_config_var('PY_CFLAGS_NODIST')) |
| 51 | else: |
| 52 | (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS') |
| 53 | args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags |
| 54 | -- |
| 55 | 2.17.1 |
| 56 | |