diff options
| author | Howard Su <howard0su@gmail.com> | 2016-10-25 02:38:24 +0300 |
|---|---|---|
| committer | Howard Su <howard0su@gmail.com> | 2016-10-25 02:38:24 +0300 |
| commit | a72f68e8a9dc811bf462c861f8cca9623ec139ff (patch) | |
| tree | 5b5f4037d23e936f154261665e157700c9d7a2bb | |
| parent | 8c3f15a9497bb23519ee3d60a765d223e001ab13 (diff) | |
we can use _NPROCESSOR_CONF instead of a hack for tegra
| -rw-r--r-- | rocks/cutorch-1.0-0.rockspec | 10 | ||||
| -rw-r--r-- | rocks/cutorch-scm-1.rockspec | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/rocks/cutorch-1.0-0.rockspec b/rocks/cutorch-1.0-0.rockspec index 593d2a9..07e309e 100644 --- a/rocks/cutorch-1.0-0.rockspec +++ b/rocks/cutorch-1.0-0.rockspec @@ -22,16 +22,10 @@ build = { type = "command", build_command = [[ -isTegra=$(uname -a | grep -E '(tegra|aarch)' | wc | awk '{print $1'}) -if [ "1" -eq "$isTegra" ] - then - jopts=3 - else - jopts=$(getconf _NPROCESSORS_ONLN) -fi +jopts=$(getconf _NPROCESSORS_CONF) echo "Building on $jopts cores" -cmake -E make_directory build && cd build && cmake .. -DLUALIB=$(LUALIB) -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$(LUA_BINDIR)/.." -DCMAKE_INSTALL_PREFIX="$(PREFIX)" && $(MAKE) -j$(jopts) install +cmake -E make_directory build && cd build && cmake .. -DLUALIB=$(LUALIB) -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$(LUA_BINDIR)/.." -DCMAKE_INSTALL_PREFIX="$(PREFIX)" && $(MAKE) -j$jopts install ]], platforms = { windows = { diff --git a/rocks/cutorch-scm-1.rockspec b/rocks/cutorch-scm-1.rockspec index ca4c6a8..8314385 100644 --- a/rocks/cutorch-scm-1.rockspec +++ b/rocks/cutorch-scm-1.rockspec @@ -21,16 +21,10 @@ build = { type = "command", build_command = [[ -isTegra=$(uname -a | grep -E '(tegra|aarch)' | wc | awk '{print $1'}) -if [ "1" -eq "$isTegra" ] - then - jopts=3 - else - jopts=$(getconf _NPROCESSORS_ONLN) -fi +jopts=$(getconf _NPROCESSORS_CONF) echo "Building on $jopts cores" -cmake -E make_directory build && cd build && cmake .. -DLUALIB=$(LUALIB) -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$(LUA_BINDIR)/.." -DCMAKE_INSTALL_PREFIX="$(PREFIX)" && $(MAKE) -j$(jopts) install +cmake -E make_directory build && cd build && cmake .. -DLUALIB=$(LUALIB) -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$(LUA_BINDIR)/.." -DCMAKE_INSTALL_PREFIX="$(PREFIX)" && $(MAKE) -j$jopts install ]], platforms = { windows = { |