Skip to content

Commit 1fd929c

Browse files
committed
add seperate configuration item for 'install' cmd
1 parent 96de844 commit 1fd929c

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

config-amdgpu.sh.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33

44
: ${CMAKE_MAKE:=""}
55
: ${MAKE:="make -j4"}
6+
: ${MAKE_INSTALL:="make install"}
67

78
# use this for ninja instead of make
89
#: ${CMAKE_MAKE:="-G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DLLVM_PARALLEL_COMPILE_JOBS=4 -DLLVM_PARALLEL_LINK_JOBS=1"}
910
#: ${MAKE:="ninja"}
11+
#: ${MAKE_INSTALL:="ninja install"}
1012

1113
# set this to true if you don't have a github account
1214
: ${HTTPS:=true}

config.sh.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33

44
: ${CMAKE_MAKE:=""}
55
: ${MAKE:="make -j4"}
6+
: ${MAKE_INSTALL:="make install"}
67

78
# use this for ninja instead of make
89
#: ${CMAKE_MAKE:="-G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DLLVM_PARALLEL_COMPILE_JOBS=4 -DLLVM_PARALLEL_LINK_JOBS=1"}
910
#: ${MAKE:="ninja"}
11+
#: ${MAKE_INSTALL:="ninja install"}
1012

1113
# set this to true if you don't have a github account
1214
: ${HTTPS:=true}

setup.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ if [ "${CMAKE-}" == true ]; then
8383

8484
cd cmake_build
8585
cmake ../CMake -DBUILD_CursesDialog:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH="${CUR}/cmake_install"
86-
${MAKE} install
86+
${MAKE}
87+
${MAKE_INSTALL}
8788
cd "${CUR}"
8889

8990
export PATH="${CUR}/cmake_install/bin:${PATH}"
@@ -130,7 +131,8 @@ if [ "${LLVM-}" == true ]; then
130131
fi
131132
cmake ../llvm-project/llvm ${CMAKE_MAKE} -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON -DLLVM_LINK_LLVM_DYLIB:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH="${CUR}/llvm_install" \
132133
-DLLVM_ENABLE_RTTI:BOOL=ON -DLLVM_ENABLE_PROJECTS:STRING="clang;lld" -DLLVM_ENABLE_BINDINGS:BOOL=OFF -DLLVM_INCLUDE_TESTS:BOOL=ON -DLLVM_TARGETS_TO_BUILD:STRING="${LLVM_TARGETS}" -DDEFAULT_SYSROOT:PATH="${DEFAULT_SYSROOT}"
133-
${MAKE} install
134+
${MAKE}
135+
${MAKE_INSTALL}
134136
cd "${CUR}"
135137

136138
LLVM_VARS=-DLLVM_DIR:PATH="${CUR}/llvm_install/lib/cmake/llvm"

0 commit comments

Comments
 (0)