Merge branch 'fix-makefiles' into 'bugfix-60'

remove unneccessary arm* makefiles See merge request integer/soplex!379
scipopt · Jun 23, 2022 · 8b86b30 · 8b86b30
2 parents f081c3e + eb106bf
commit 8b86b30
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 27 deletions.
diff --git a/make/make.darwin.arm64.gnu b/make/make.darwin.arm64.gnu
diff --git a/make/make.darwin.arm64.gnu.dbg b/make/make.darwin.arm64.gnu.dbg
diff --git a/make/make.darwin.arm64.gnu.opt b/make/make.darwin.arm64.gnu.opt
diff --git a/make/make.detecthost b/make/make.detecthost
@@ -30,7 +30,8 @@ ARCH := $(shell uname -m | \
  -e 's/9000..../hppa/' \
  -e 's/Power\ Macintosh/ppc/' \
  -e 's/00........../pwr4/'\
- -e 's/arm.*/arm/')
+ -e 's/arm.*/arm/' \
+ -e 's/aarch64/arm/')
 OSTYPE := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
  sed \
  -e 's/cygwin.*/cygwin/' \

diff --git a/make/make.linux.armv7l.gnu b/make/make.linux.armv7l.gnu
diff --git a/make/make.linux.armv7l.gnu.dbg b/make/make.linux.armv7l.gnu.dbg
diff --git a/make/make.linux.armv7l.gnu.opt b/make/make.linux.armv7l.gnu.opt