diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2020-04-01 12:28:01 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2020-04-01 12:28:01 +0200 |
| commit | b2f7ee0a58332ecbcc4cad3eb5f09834ce92cd17 (patch) | |
| tree | fffd04d7fa3e0f469d358f6bd2c85d9ca042c918 | |
| parent | Fix Swift 5.2 build failures (diff) | |
| download | ice-b2f7ee0a58332ecbcc4cad3eb5f09834ce92cd17.tar.bz2 ice-b2f7ee0a58332ecbcc4cad3eb5f09834ce92cd17.tar.xz ice-b2f7ee0a58332ecbcc4cad3eb5f09834ce92cd17.zip | |
Don't assume multilib for x86 platforms, fixes #773
| -rw-r--r-- | config/Make.rules.Linux | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/Make.rules.Linux b/config/Make.rules.Linux index b3747834833..1f9bfe339a8 100644 --- a/config/Make.rules.Linux +++ b/config/Make.rules.Linux @@ -4,7 +4,7 @@ known_distributions := centos rhel fedora debian ubuntu amzn sles linux_ids := $(if $(wildcard /etc/os-release),$(shell . /etc/os-release && echo $${ID} $${ID_LIKE}),) -linux_id := $(word 1,$(or $(filter $(known_distributions),$(linux_ids)),$(linux_ids))) +linux_id ?= $(word 1,$(or $(filter $(known_distributions),$(linux_ids)),$(linux_ids))) is-bin-program = $(and $(filter $(bindir)%,$($4_targetdir)),$(filter $($1_target),program)) ifneq ($(OECORE_SDK_VERSION),) @@ -27,7 +27,7 @@ $(build-platform)_objdir = # system install directory system-install-dir := $(OECORE_TARGET_SYSROOT)/usr -else ifneq ($(and $(filter centos rhel fedora,$(linux_id)),$(filter x86_64 i%86,$(shell uname -m))),) +else ifneq ($(and $(filter centos rhel fedora,$(linux_id)),$(filter x86_64,$(shell uname -m))),) # # MultiLib Linux (x64 libraries go in the lib64 directory, x86 executable names are suffixed with 32) |