diff --git a/tools/make-package.sh b/tools/make-package.sh
index 90823eaa..b69f7487 100755
--- a/tools/make-package.sh
+++ b/tools/make-package.sh
@@ -80,9 +80,9 @@ if [ -z ${skip_download_sources+x} ]; then
 fi
 
 if ! [ "$set_cc_variables" = "no" ]; then
-export CC=x86_64-luna-gcc
-export CXX=x86_64-luna-g++
-export AR=x86_64-luna-ar
+export CC=$LUNA_ARCH-luna-gcc
+export CXX=$LUNA_ARCH-luna-g++
+export AR=$LUNA_ARCH-luna-ar
 export PKG_CONFIG=luna-pkg-config
 export CC_FOR_BUILD=gcc
 export CXX_FOR_BUILD=g++