aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2015-09-22 22:40:08 -0400
committerRob Austein <sra@hactrn.net>2015-09-22 22:40:08 -0400
commit9da77fca6cc08e56f5c2330b15653a427e4978f9 (patch)
treed927b5ba0de21792ad08ff0ac49951250f876a87 /core
parentd62c2ed47d64332b025c79f6d15129eb1f2fc865 (diff)
Tweak XiLinx build to work on both 32-bit and 64-bit VMs.
Diffstat (limited to 'core')
-rw-r--r--core/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile
index 55ce0ea..b6dc3ff 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -33,6 +33,10 @@
BUILD_DIR := platform/novena/eim/build
+# Build scripts need to know the build host's word size, sigh.
+
+WORD_SIZE := $(shell python -c 'from struct import pack; print len(pack("L", 0)) * 8')
+
# This business of patching files that are under revision control
# because we can't be bothered to generate a proper configuration file
# is kind of nasty.
@@ -40,7 +44,7 @@ BUILD_DIR := platform/novena/eim/build
all:
patch -p1 --forward <patches/01-config-cores.patch
touch platform/novena/common/rtl/ipcore/clkmgr_dcm.v
- cd ${BUILD_DIR}; $(MAKE)
+ cd ${BUILD_DIR}; $(MAKE) xil_env='. $$(isedir)/settings${WORD_SIZE}.sh'
patch -p1 --reverse <patches/01-config-cores.patch
clean: