Skip to content

Commit 26ed387

Browse files
author
auREAX
committed
Rename configure --enable-pax-marks flag to --enable-pax-flags flag.
1 parent 039110b commit 26ed387

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

configure

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ opt manage-submodules 1 "let the build manage the git submodules"
295295
opt mingw-cross 0 "cross-compile for win32 using mingw"
296296
opt clang 0 "prefer clang to gcc for building the runtime"
297297
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)"
299299
valopt prefix "/usr/local" "set installation prefix"
300300
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
301301
valopt llvm-root "" "set LLVM root"
@@ -362,12 +362,12 @@ fi
362362

363363
if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
364364
then
365-
if [ ! -z "$CFG_ENABLE_PAX_MARKS" -a -z "$CFG_PAXCTL" ]
365+
if [ ! -z "$CFG_ENABLE_PAX_FLAGS" -a -z "$CFG_PAXCTL" ]
366366
then
367367
err "enabled PaX markings but no paxctl binary found"
368368
fi
369369

370-
if [ -z "$CFG_DISABLE_PAX_MARKS" ]
370+
if [ -z "$CFG_DISABLE_PAX_FLAGS" ]
371371
then
372372
# GRSecurity/PaX detection. This can be very flaky.
373373
GRSEC_DETECTED=
@@ -395,9 +395,9 @@ then
395395
step_msg "GRSecurity: yes"
396396
if [ ! -z "$CFG_PAXCTL" ]
397397
then
398-
CFG_ENABLE_PAX_MARKS=1
398+
CFG_ENABLE_PAX_FLAGS=1
399399
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"
401401
fi
402402
else
403403
step_msg "GRSecurity: no"
@@ -750,9 +750,9 @@ putvar CFG_C_COMPILER
750750
putvar CFG_LIBDIR
751751
putvar CFG_DISABLE_MANAGE_SUBMODULES
752752

753-
if [ ! -z "$CFG_ENABLE_PAX_MARKS" ]
753+
if [ ! -z "$CFG_ENABLE_PAX_FLAGS" ]
754754
then
755-
putvar CFG_ENABLE_PAX_MARKS
755+
putvar CFG_ENABLE_PAX_FLAGS
756756
putvar CFG_PAXCTL
757757
fi
758758

mk/stage0.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ifdef CFG_ENABLE_LOCAL_RUST
1212
$(Q)$(S)src/etc/local_stage0.sh $(CFG_HOST_TRIPLE) $(CFG_LOCAL_RUST_ROOT)
1313
else
1414
$(Q)$(S)src/etc/get-snapshot.py $(CFG_HOST_TRIPLE) $(SNAPSHOT_FILE)
15-
ifdef CFG_ENABLE_PAX_MARKS
16-
@$(call E, apply PaX markings: $@)
15+
ifdef CFG_ENABLE_PAX_FLAGS
16+
@$(call E, apply PaX flags: $@)
1717
@"$(CFG_PAXCTL)" -cm "$@"
1818
endif
1919
endif

mk/target.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X): \
2929
$$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
3030
@$$(call E, compile_and_link: $$@)
3131
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$<
32-
ifdef CFG_ENABLE_PAX_MARKS
33-
@$$(call E, apply PaX markings: $$@)
32+
ifdef CFG_ENABLE_PAX_FLAGS
33+
@$$(call E, apply PaX flags: $$@)
3434
@"$(CFG_PAXCTL)" -cm "$$@"
3535
endif
3636

0 commit comments

Comments
 (0)