diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2020-04-02 13:07:52 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2020-04-02 13:07:52 +0200 |
| commit | 07fc824878f46ad58f66c0be9e2a853fd719b0db (patch) | |
| tree | 43d94fcf114193affd24fd182cbce9fc724c5b06 | |
| parent | Don't assume multilib for x86 platforms, fixes #773 (diff) | |
| download | ice-07fc824878f46ad58f66c0be9e2a853fd719b0db.tar.bz2 ice-07fc824878f46ad58f66c0be9e2a853fd719b0db.tar.xz ice-07fc824878f46ad58f66c0be9e2a853fd719b0db.zip | |
Added back check for x86 for multilib platforms #773
The check is required when building RPM packages for CentOS/RHEL.
If building on a x86 platform which doesn't support multilib, either
"make PLATFORMS=x86" should be used or the linux_id variable should be set with
the linux ID of the distribution (make linux_id=<distribution>).
By default, the build system checks for ID_LIKE for the distribution type and
assumes a multilib platform if ID_LIKE is fedora, centos or rhel.
| -rw-r--r-- | config/Make.rules.Linux | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/Make.rules.Linux b/config/Make.rules.Linux index 1f9bfe339a8..f0ce17add74 100644 --- a/config/Make.rules.Linux +++ b/config/Make.rules.Linux @@ -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,$(shell uname -m))),) +else ifneq ($(and $(filter centos rhel fedora,$(linux_id)),$(filter x86_64 i%86,$(shell uname -m))),) # # MultiLib Linux (x64 libraries go in the lib64 directory, x86 executable names are suffixed with 32) |