@@ -295,7 +295,7 @@ opt manage-submodules 1 "let the build manage the git submodules"
295
295
opt mingw-cross 0 " cross-compile for win32 using mingw"
296
296
opt clang 0 " prefer clang to gcc for building the runtime"
297
297
opt local-rust 0 " use an installed rustc rather than downloading a snapshot"
298
- opt pax-marks 0 " apply PaX markings to rustc binaries (required for GRSecurity/PaX-patched kernels)"
298
+ opt pax-flags 0 " apply PaX flags to rustc binaries (required for GRSecurity/PaX-patched kernels)"
299
299
valopt prefix " /usr/local" " set installation prefix"
300
300
valopt local-rust-root " /usr/local" " set prefix for local rust binary"
301
301
valopt llvm-root " " " set LLVM root"
362
362
363
363
if [ " $CFG_OSTYPE " = " unknown-linux-gnu" ]
364
364
then
365
- if [ ! -z " $CFG_ENABLE_PAX_MARKS " -a -z " $CFG_PAXCTL " ]
365
+ if [ ! -z " $CFG_ENABLE_PAX_FLAGS " -a -z " $CFG_PAXCTL " ]
366
366
then
367
367
err " enabled PaX markings but no paxctl binary found"
368
368
fi
369
369
370
- if [ -z " $CFG_DISABLE_PAX_MARKS " ]
370
+ if [ -z " $CFG_DISABLE_PAX_FLAGS " ]
371
371
then
372
372
# GRSecurity/PaX detection. This can be very flaky.
373
373
GRSEC_DETECTED=
395
395
step_msg " GRSecurity: yes"
396
396
if [ ! -z " $CFG_PAXCTL " ]
397
397
then
398
- CFG_ENABLE_PAX_MARKS =1
398
+ CFG_ENABLE_PAX_FLAGS =1
399
399
else
400
- warn " GRSecurity kernel detected but no paxctl binary found: not setting CFG_ENABLE_PAX_MARKS "
400
+ warn " GRSecurity kernel detected but no paxctl binary found: not setting CFG_ENABLE_PAX_FLAGS "
401
401
fi
402
402
else
403
403
step_msg " GRSecurity: no"
@@ -750,9 +750,9 @@ putvar CFG_C_COMPILER
750
750
putvar CFG_LIBDIR
751
751
putvar CFG_DISABLE_MANAGE_SUBMODULES
752
752
753
- if [ ! -z " $CFG_ENABLE_PAX_MARKS " ]
753
+ if [ ! -z " $CFG_ENABLE_PAX_FLAGS " ]
754
754
then
755
- putvar CFG_ENABLE_PAX_MARKS
755
+ putvar CFG_ENABLE_PAX_FLAGS
756
756
putvar CFG_PAXCTL
757
757
fi
758
758
0 commit comments