Skip to content

Commit

Permalink
boulder/macros: Allow actually removing the new flags
Browse files Browse the repository at this point in the history
Option groups shouldn't really be using `disabled` as they can't be
excluded from the flag set, which is in turn bricking the nvidia
module build.

Additionally, the build-id stuff is mandated at the toolchain level.
For now the option is kept here as a toggleable but it doesn't really
make sense to be here at all. In future it could perhaps become an
option group to decide the build-id hash variety.

Signed-off-by: Ikey Doherty <[email protected]>
  • Loading branch information
ikeycode committed Jan 17, 2025
1 parent e58862d commit e5ea34d
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions boulder/data/macros/arch/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ tuning :
enabled: compress-debug-zlib
- zstd:
enabled: compress-debug-zstd
disabled: compress-debug-none
default: zstd

# Toggle frame-pointer
Expand All @@ -156,7 +155,6 @@ tuning :
# Toggle build-id
- build-id:
enabled: build-id
disabled: build-id-none

# Enable bindnow functionality
- bindnow:
Expand Down Expand Up @@ -479,11 +477,6 @@ flags :
ld : "-Wl,--build-id=sha1"
rust : "-C link-args=-Wl,--build-id=sha1"

# Disable build-id (OFF)
- build-id-none:
ld : "-Wl,--build-id=none"
rust : "-C link-args=-Wl,--build-id=none"

# Compress debug symbols with Zstd (ON)
- compress-debug-zstd:
c : "-Wa,--compress-debug-sections=zstd"
Expand Down

0 comments on commit e5ea34d

Please sign in to comment.