From 625a5d96bbaadbbe0a67d8f6b24e309d9366a237 Mon Sep 17 00:00:00 2001
From: Aleksey Demakov <ademakov@gmail.com>
Date: Wed, 18 Apr 2012 17:42:18 +0400
Subject: [PATCH] Allow for alternative make names while building luajit (bug
#984898)
---
third_party/CMakeLists.txt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 1820bf0f3f..ff332b4f62 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -21,10 +21,10 @@ macro (luajit_build)
if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/luajit/src/libluajit.a
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/luajit
- COMMAND make clean
- COMMAND make -C src -t buildvm_x86.h buildvm_arm.h
+ COMMAND $(MAKE) clean
+ COMMAND $(MAKE) -C src -t buildvm_x86.h buildvm_arm.h
buildvm_x64.h buildvm_x64win.h
- COMMAND make -C src ${luajit_buildoptions}
+ COMMAND $(MAKE) -C src ${luajit_buildoptions}
DEPENDS ${CMAKE_SOURCE_DIR}/CMakeCache.txt
)
else()
@@ -34,10 +34,10 @@ macro (luajit_build)
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/luajit/src/libluajit.a
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/luajit
COMMAND cp -r ${PROJECT_SOURCE_DIR}/third_party/luajit/* .
- COMMAND make clean
- COMMAND make -C src -t buildvm_x86.h buildvm_arm.h
+ COMMAND $(MAKE) clean
+ COMMAND $(MAKE) -C src -t buildvm_x86.h buildvm_arm.h
buildvm_x64.h buildvm_x64win.h
- COMMAND make -C src ${luajit_buildoptions}
+ COMMAND $(MAKE) -C src ${luajit_buildoptions}
DEPENDS ${PROJECT_BINARY_DIR}/CMakeCache.txt ${PROJECT_BINARY_DIR}/third_party/luajit
)
endif()
--
GitLab