diff options
| author | Jose <jose@zeroc.com> | 2016-06-16 21:53:46 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-20 22:54:16 +0200 |
| commit | 5ae7fe118510a69fa5eb9b91c2bd4219a0204d56 (patch) | |
| tree | b92123ae374f4851b1363561b467e326e2685d1f /cpp/config | |
| parent | Merge branch '3.6-stretch' into 3.6 (diff) | |
| download | ice-5ae7fe118510a69fa5eb9b91c2bd4219a0204d56.tar.bz2 ice-5ae7fe118510a69fa5eb9b91c2bd4219a0204d56.tar.xz ice-5ae7fe118510a69fa5eb9b91c2bd4219a0204d56.zip | |
Fix to support Debian x32 arch
Diffstat (limited to 'cpp/config')
| -rw-r--r-- | cpp/config/Make.rules.Linux | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux index 3e70e0a9c82..b8789943765 100644 --- a/cpp/config/Make.rules.Linux +++ b/cpp/config/Make.rules.Linux @@ -79,7 +79,12 @@ ifeq ($(GCC_COMPILER),yes) CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED endif - ifeq ($(MACHINE),x86_64) + # + # Only use multilib -m32/-m64 options for amd64 arch, x32 arch can also run + # in amd64 macines but doesn't use multilib, in this case MACHINE_TYPE will + # be x86_64 and HOST_ARCH x32. + # + ifeq ($(HOST_ARCH),amd64) ifeq ($(LP64),yes) CXXARCHFLAGS += -m64 else |