Skip to content

Commit

Permalink
libsys: Add CHERI_LIB_C18N to CFLAGS when appropriate
Browse files Browse the repository at this point in the history
  • Loading branch information
@dpgao
dpgao committed Sep 5, 2024
1 parent bc9cb1c commit c1d42dc
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/libsys/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ PRECIOUSLIB=
# it will be loaded during program startup.
CFLAGS+= -ftls-model=initial-exec

.ifdef CHERI_LIB_C18N
CFLAGS+=-DCHERI_LIB_C18N
.endif

This comment has been minimized.

Sign in to view

Copy link
@brooksdavis

brooksdavis Sep 5, 2024

Member

This is fine, but a better solution might be to add the CFLAGS entry to lib/c18n/Makefile.inc and remove this block from lib/lib{c,thr}/Makefile

This comment has been minimized.

Sign in to view

Copy link
@bsdjhb

bsdjhb Sep 6, 2024

Collaborator

I do prefer that more centralized approach as well as any other changes that can be moved there instead of duplicated.
#
# Link with static libcompiler_rt.a.
#

Check warning on line 50 in lib/libsys/Makefile

View workflow job for this annotation

GitHub Actions / Style Checker 

Missing Signed-off-by: line
Expand Down

0 comments on commit c1d42dc

Please sign in to comment.