--- a/rakelib/compile.rake	Sun May 22 01:14:35 2016 +0100
+++ b/rakelib/compile.rake	Mon May 23 19:46:10 2016 +0100
@@ -267,7 +267,7 @@
     end
 
     task STX_CONF_DIR / 'myConf' do
-      if amd64? 
+      if x86_64? 
         if ARCH == 'x86_64'
           cp STX_CONF_DIR / 'linux-elf' / 'x86_64' / 'defines' , STX_CONF_DIR / 'myConf'
         else
@@ -291,7 +291,7 @@
         f.puts "XDEFS+=-DHAVE_FONTCONFIG -DXFT"
         f.puts "XINCLUDE+=$(shell pkg-config --cflags xft)"
         f.puts "LIB_XFT=-l:libXft.so.2 -l:libfontconfig.so.1"
-        if amd64? and ARCH == 'x86_64' then
+        if x86_64? and ARCH == 'x86_64' then
           f.puts 'MAKE_ZLIB_ARG= "CFLAGS=-fPIC -O3 -DUSE_MMAP"'
           # Hack to build FFI for 64-bit Linux builds
           f.puts 'FFI_OBJS=$(FFI_DIR)/build/src/*.o $(FFI_DIR)/build/src/x86/*.o'
@@ -331,7 +331,7 @@
   end
 
   task :stc do
-    if linux? and amd64? and ARCH == 'i386'
+    if linux? and x86_64? and ARCH == 'i386'
       stx_make_flags="STC_LEXLIB=libfl/libfl_pic.a"
     else
       stx_make_flags=""