summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-06-08 12:27:02 +0200
committerJose <jose@zeroc.com>2016-06-08 12:27:02 +0200
commit708954126877087dd8051ec203f63b9b0e4a64c2 (patch)
treeea7add8a2e5ea24fb315d5d31645195dd3bd163f
parentCustomizable PHP config (diff)
downloadice-3.6.2-stretch.tar.bz2
ice-3.6.2-stretch.tar.xz
ice-3.6.2-stretch.zip
Fix binsuffix so that is only set of x86 buildsv3.6.2-stretch
-rw-r--r--config/Make.common.rules15
1 files changed, 14 insertions, 1 deletions
diff --git a/config/Make.common.rules b/config/Make.common.rules
index 968d1081c31..420b025bfcc 100644
--- a/config/Make.common.rules
+++ b/config/Make.common.rules
@@ -96,9 +96,22 @@ ifeq ($(UNAME),Linux)
ifeq ($(LP64),)
LP64 = yes
endif
+
+ #
+ # x86 binaries build on x86_64 machine use 32 binsuffix
+ #
+ ifneq ($(STATICLIBS),yes)
+ ifneq ($(LP64),yes)
+ binsuffix = 32
+ endif
+ endif
endif
+
+ #
+ # x86 builds uses 32 binsuffix
+ #
ifneq ($(STATICLIBS),yes)
- ifneq ($(LP64),yes)
+ ifeq ($(findstring $(MACHINE_TYPE),i386 i486 i586 i686),$(MACHINE_TYPE))
binsuffix = 32
endif
endif