[xen staging] tools/python: Pass linker to Python build process

[patchbot@xxxxxxx]

commit 17d192e0238d6c714e9f04593b59597b7090be38
Author:     Elliott Mitchell <ehem+xen@xxxxxxx>
AuthorDate: Sun Oct 11 18:11:39 2020 -0700
Commit:     Wei Liu <wl@xxxxxxx>
CommitDate: Fri Oct 16 13:25:35 2020 +0000

    tools/python: Pass linker to Python build process
    
    Unexpectedly the environment variable which needs to be passed is
    $LDSHARED and not $LD.  Otherwise Python may find the build `ld` instead
    of the host `ld`.
    
    Replace $(LDFLAGS) with $(SHLIB_LDFLAGS) as Python needs shared objects
    it can load at runtime, not executables.
    
    This uses $(CC) instead of $(LD) since Python distutils appends $CFLAGS
    to $LDFLAGS which breaks many linkers.
    
    Signed-off-by: Elliott Mitchell <ehem+xen@xxxxxxx>
    Acked-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
---
 tools/pygrub/Makefile | 9 +++++----
 tools/python/Makefile | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 3063c4998f..37b2146214 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -3,20 +3,21 @@ XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS)
-PY_LDFLAGS = $(LDFLAGS) $(APPEND_LDFLAGS)
+PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
 INSTALL_LOG = build/installed_files.txt
 
 .PHONY: all
 all: build
 .PHONY: build
 build:
-       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) 
setup.py build
+       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" 
LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
 
 .PHONY: install
 install: all
        $(INSTALL_DIR) $(DESTDIR)/$(bindir)
-       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \
-               setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
+       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \
+               LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \
+               --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
                 --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force
        set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
                     "`readlink -f $(DESTDIR)/$(bindir)`" != \
diff --git a/tools/python/Makefile b/tools/python/Makefile
index 8dc755d6e8..5e555acf1c 100644
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -5,19 +5,20 @@ include $(XEN_ROOT)/tools/Rules.mk
 all: build
 
 PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS)
-PY_LDFLAGS = $(LDFLAGS) $(APPEND_LDFLAGS)
+PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
 INSTALL_LOG = build/installed_files.txt
 
 .PHONY: build
 build:
-       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py build
+       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" 
LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
 
 .PHONY: install
 install:
        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
 
-       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \
-               setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
+       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \
+               LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \
+               --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
                --root="$(DESTDIR)" --force
 
        $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream 
$(DESTDIR)$(LIBEXEC_BIN)
--
generated by git-patchbot for /home/xen/git/xen.git#staging