diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2004-01-21 16:49:05 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2004-01-21 16:49:05 +0000 |
| commit | d3282d6eecaad55a20886552307e332ac60b29a9 (patch) | |
| tree | 40bfcb516ecf29826978a024fe7d50a04f56151f /usr.sbin | |
| parent | 60cfb6bcd71dc38694a1ece17a720f74a5abce74 (diff) | |
| download | src-d3282d6eecaad55a20886552307e332ac60b29a9.tar.gz src-d3282d6eecaad55a20886552307e332ac60b29a9.zip | |
Disable constant merging in isdnd and isdnmonitor. This is a "make my
life easier" patch: I doubt this will affect anyone else, but the FreeBSD
Update build code was getting very confused by this.
Approved by: rwatson (mentor)
PR: bin/61087
Notes
Notes:
svn path=/head/; revision=124800
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/i4b/isdnd/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/i4b/isdnmonitor/Makefile | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/usr.sbin/i4b/isdnd/Makefile b/usr.sbin/i4b/isdnd/Makefile index 644df2fac3e1..bc4fc38763a3 100644 --- a/usr.sbin/i4b/isdnd/Makefile +++ b/usr.sbin/i4b/isdnd/Makefile @@ -10,6 +10,10 @@ SRCS= rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c \ # compile debug support COPTS+= -DDEBUG +# avoid wacky merging of string constants from +# source code with compile-time timestamp +COPTS+= -fno-merge-constants + # enable rtprio usage COPTS+= -DUSE_RTPRIO diff --git a/usr.sbin/i4b/isdnmonitor/Makefile b/usr.sbin/i4b/isdnmonitor/Makefile index 7be43b91c7e7..2eb82d4d3d91 100644 --- a/usr.sbin/i4b/isdnmonitor/Makefile +++ b/usr.sbin/i4b/isdnmonitor/Makefile @@ -7,6 +7,10 @@ SRCS= main.c curses.c # compile debug support COPTS+= -DDEBUG +# avoid wacky merging of string constants from +# source code with compile-time timestamp +COPTS+= -fno-merge-constants + DPADD= ${LIBCURSES} LDADD= -lcurses |