@@ -11,6 +11,7 @@ SMARTDNS_WEBUI_URL="https://github.com/pymumu/smartdns-webui/archive/refs/heads/
1111SMARTDNS_WEBUI_SOURCE=" $WORKDIR /smartdns-webui"
1212SMARTDNS_STATIC_DIR=" $WORKDIR /smartdns-static"
1313SMARTDNS_WITH_LIBS=0
14+ MAKE_NJOBS=1
1415
1516export CC
1617export STRIP
@@ -56,6 +57,9 @@ init_env()
5657 CC=gcc
5758 fi
5859
60+ MAKE_NJOBS=$( grep processor /proc/cpuinfo | wc -l 2> /dev/null || echo 1)
61+ export MAKE_NJOBS
62+
5963 mkdir -p $WORKDIR
6064 if [ $? -ne 0 ]; then
6165 echo " create work directory failed"
@@ -160,16 +164,16 @@ copy_linker()
160164 echo " libc: $LIBC_PATH "
161165
162166 if [ " $SYM_LINKER_NAME " = " $LIBC_PATH " ]; then
163- ln -f -s $( basename $LIBC_PATH ) $SMARTDNS_STATIC_DIR /$( basename $LINKER_NAME )
167+ ln -f -s $( basename $LIBC_PATH ) $SMARTDNS_STATIC_DIR /lib/ $( basename $LINKER_NAME )
164168 else
165169 cp $LINK_PATH $SMARTDNS_STATIC_DIR /lib -af
166170 if [ $? -ne 0 ]; then
167171 echo " copy $lib failed"
168172 return 1
169173 fi
170174
171- SYM_LINKER_NAME=` readlink $SMARTDNS_STATIC_DIR /$LINKER_NAME `
172- if [ ! -e $SMARTDNS_STATIC_DIR /$SYM_LINKER_NAME ]; then
175+ SYM_LINKER_NAME=` readlink $SMARTDNS_STATIC_DIR /lib/ $LINKER_NAME `
176+ if [ ! -e $SMARTDNS_STATIC_DIR /lib/ $SYM_LINKER_NAME ]; then
173177 SYM_LINKER_NAME=` basename $SYM_LINKER_NAME `
174178 ln -f -s $SYM_LINKER_NAME $SMARTDNS_STATIC_DIR /lib/$LINKER_NAME
175179 fi
@@ -197,14 +201,15 @@ build_smartdns()
197201
198202 make -C $CODE_DIR clean $MAKE_ARGS
199203 if [ $SMARTDNS_WITH_LIBS -eq 1 ]; then
200- export LDFLAGS=' -Wl,-dynamic-linker,' lib/$( echo $LINKER_NAME ) ' -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/lib'
204+ LINK_LDFLAGS=' -Wl,-dynamic-linker,' lib/$( echo $LINKER_NAME ) ' -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/lib'
205+ export LDFLAGS=" $LDFLAGS $LINK_LDFLAGS "
201206 echo " LDFLAGS: $LDFLAGS "
202207 RUSTFLAGS=' -C link-arg=-Wl,-rpath,$$ORIGIN'
203208 echo " Building smartdns with specific linker..."
204209 unset STATIC
205210 fi
206211
207- RUSTFLAGS=" $RUSTFLAGS " make -C $CODE_DIR $MAKE_WITH_UI all -j8 VER=$VER $MAKE_ARGS
212+ RUSTFLAGS=" $RUSTFLAGS " make -C $CODE_DIR $MAKE_WITH_UI all -j $MAKE_NJOBS VER=$VER $MAKE_ARGS
208213 if [ $? -ne 0 ]; then
209214 echo " make smartdns failed"
210215 exit 1
@@ -325,14 +330,13 @@ build()
325330 fi
326331 fi
327332
328- build_webpages
329- if [ $? -ne 0 ]; then
330- echo " build smartdns-ui failed"
331- return 1
332- fi
333-
334333 WITH_UI_ARGS=" "
335334 if [ $WITH_UI -eq 1 ] && [ " $PLATFORM " != " luci" ]; then
335+ build_webpages
336+ if [ $? -ne 0 ]; then
337+ echo " build smartdns-ui failed"
338+ return 1
339+ fi
336340 WITH_UI_ARGS=" --with-ui"
337341 fi
338342
0 commit comments