diff options
| author | Jose <jose@zeroc.com> | 2017-06-01 22:24:41 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-06-01 22:24:41 +0200 |
| commit | 74b36d26ef203ebc25f70d984ec03b3a1036a2cb (patch) | |
| tree | 56e98df3d11721c337daa03beb68cd984c1a03e5 | |
| parent | Fixed ICE-7951 - don't ignore exceptions from testsuite setup/teardown (diff) | |
| download | ice-74b36d26ef203ebc25f70d984ec03b3a1036a2cb.tar.bz2 ice-74b36d26ef203ebc25f70d984ec03b3a1036a2cb.tar.xz ice-74b36d26ef203ebc25f70d984ec03b3a1036a2cb.zip | |
Yocto targetdir and build-platform fixes
| -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 aeb950c29bd..6ce24828e59 100644 --- a/config/Make.rules.Linux +++ b/config/Make.rules.Linux @@ -27,7 +27,7 @@ $(build-platform)_installdir = /$(build-platform) $(target-platform)_cc = $(CC) $(target-platform)_cxx = $(CXX) $(target-platform)_libtool = $(AR) -$(target-platform)_targetdir = /$(target-platform) +$(target-platform)_targetdir = $(if $(filter %/build,$5),/$(target-platform)) $(target-platform)_objdir = /$(target-platform) cppflags := $(if $(filter yes,$(OPTIMIZE)),-O2) @@ -117,7 +117,7 @@ ifeq ($(OPTIMIZE),yes) endif -build-platform = $(shell uname -m) +build-platform = $(if $(filter arm%,$(shell uname -m)),arm,$(shell uname -m)) supported-platforms = $(build-platform) lib-suffix = $(if $(filter x86_64,$(build-platform)),64,) |