summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-04-17 07:14:13 +0800
committerGitHub <[email protected]>2019-04-17 07:14:13 +0800
commitcce9a53e76072dc8317f319b77fd408bdf57238e (patch)
treee265350c57302186364c56cbe0c49da345e90b9f
parentf8d10e39d00b9b9e4d2d1ee63039f81f6c9a63d4 (diff)
parent9cebcd69efd4587e3ac56b23e488fbbc9b359f48 (diff)
Merge pull request #402 from 0x17de/fix-describe-arch-mapping-amd64
makefile: describe mapping from amd64 to x86_64
-rw-r--r--makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/makefile b/makefile
index c651c3d18..4bc84492a 100644
--- a/makefile
+++ b/makefile
@@ -39,7 +39,12 @@ endif
endif
-# map architecture amd64 to x86_64
+# conditionally map ARCH from amd64 to x86_64 if set from the outside
+#
+# Some OS provide a definition for $(ARCH) through an environment
+# variable. It might be set to amd64 which implies x86_64. Since e.g.
+# luajit expects either i386 or x86_64, the value amd64 is transformed
+# to match a directory for a platform dependent implementation.
ARCH :=$(if $(findstring amd64,$(ARCH)),x86_64,$(ARCH))
xmake_dir_install :=$(prefix)/share/xmake