diff options
| -rw-r--r-- | config/Make.rules.Linux | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/config/Make.rules.Linux b/config/Make.rules.Linux index 3e59f2ab7b8..75fb2ab6b71 100644 --- a/config/Make.rules.Linux +++ b/config/Make.rules.Linux @@ -7,13 +7,15 @@ # # ********************************************************************** -linux_id = $(shell . /etc/os-release && echo $${ID}) +ifneq ($(wildcard $(/etc/os-release)),) + linux_id = $(shell . /etc/os-release && echo $${ID}) +endif -is-bin-program = $(and $(filter $(bindir)%,$($4_targetdir)),$(filter $($1_target),program)) +is-bin-program = $(and $(filter $(bindir)%,$($4_targetdir)),$(filter $($1_target),program)) ifneq ($(OECORE_SDK_VERSION),) -build-platform = $(if $(filter x86_64,$(shell uname -m)),x64,x86) +build-platform = $(shell uname -m) target-platform = $(shell echo $(CXX) | sed -r 's/^([a-z0-9_]+)-.*/\1/') supported-platforms = $(target-platform) $(build-platform) linux_id = yocto @@ -29,7 +31,6 @@ $(build-platform)_installdir = /$(build-platform) $(target-platform)_cc = $(CC) $(target-platform)_cxx = $(CXX) $(target-platform)_libtool = $(AR) - $(target-platform)_targetdir = /$(target-platform) $(target-platform)_objdir = /$(target-platform) @@ -109,8 +110,6 @@ else # # Single architecture Linux # -supported-platforms = $(if $(filter x86_64,$(shell uname -m)),x64,x86) - ifeq ($(OPTIMIZE),yes) # Use default system packaging flags if building with OPTIMIZE and CXXFLAGS/LDFLAGS aren't defined. ifneq ($(filter amzn sles,$(linux_id)),) @@ -121,14 +120,15 @@ ifeq ($(OPTIMIZE),yes) endif endif -x64_cppflags := $(call opt-cppflags,x86_64) -x64_ldflags := $(call opt-ldflags,x86_64) -x64_targetdir = $(if $(filter %/build,$5),/x64,$(if $(filter-out $($1_target),program),64)) -x64_installdir = $(if $(and $(filter-out $($1_target),program),$(filter-out %64,$($1_installdir))),64) -x86_cppflags := $(call opt-cppflags,i386) -x86_ldflags := $(call opt-ldflags,i386) -x86_targetdir = $(if $(filter %/build,$5),/x86) +build-platform = $(shell uname -m) +supported-platforms = $(build-platform) +lib-suffix = $(if $(filter x86_64,$(build-platform)),64,) + +$(build-platform)_cppflags := $(call opt-cppflags,$(build-platform)) +$(build-platform)_ldflags := $(call opt-ldflags,$(build-platform)) +$(build-platform)_targetdir = $(if $(filter %/build,$5),/$(build-platform),$(if $(filter-out $($1_target),program),$(lib-suffix))) +$(build-platform)_installdir = $(if $(and $(filter-out $($1_target),program),$(filter-out %$(lib-suffix),$($1_installdir))),$(lib-suffix)) endif |