PPC/s390: [build] fix target_arch for ppc/s390 native builds

target_arch is incorrectly set for the ppc/s390 native builds.
    The target name returned by g++ is not a subset of the target name
    passed as Make argument and therefore defaults to ia32. Adding
    a few more swap rules to set the target_arch correctly.
    This change shouldn't affect the simulator builds.

    The change to set target_arch to ia32 was added as part of:
    https://codereview.chromium.org/2045173003

R=machenbach@chromium.org, joransiu@ca.ibm.com, jyan@ca.ibm.com, michael_dawson@ca.ibm.com, mbrandy@us.ibm.com

BUG=
LOG=N

Review-Url: https://codereview.chromium.org/2077733002
Cr-Commit-Position: refs/heads/master@{#37071}
This commit is contained in:
bjaideep 2016-06-17 06:55:14 -07:00 committed by Commit bot
parent 6955c55321
commit 1298aef51f

View File

@ -448,6 +448,10 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
cut -f 2 -d " " | cut -f 1 -d "-" ))
$(eval CXX_TARGET_ARCH:=$(subst aarch64,arm64,$(CXX_TARGET_ARCH)))
$(eval CXX_TARGET_ARCH:=$(subst x86_64,x64,$(CXX_TARGET_ARCH)))
$(eval CXX_TARGET_ARCH:=$(subst s390x,s390,$(CXX_TARGET_ARCH)))
$(eval CXX_TARGET_ARCH:=$(subst powerpc,ppc,$(CXX_TARGET_ARCH)))
$(eval CXX_TARGET_ARCH:=$(subst ppc64,ppc,$(CXX_TARGET_ARCH)))
$(eval CXX_TARGET_ARCH:=$(subst ppcle,ppc,$(CXX_TARGET_ARCH)))
$(eval V8_TARGET_ARCH:=$(subst .,,$(suffix $(basename $@))))
PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/gypfiles:$(PYTHONPATH):$(shell pwd)/tools/gyp/pylib:$(PYTHONPATH)" \
GYP_GENERATORS=make \