diff options
| author | cperciva <cperciva@FreeBSD.org> | 2004-01-21 16:49:05 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2004-01-21 16:49:05 +0000 |
| commit | 8e5ee9b0a99793837e9cdeafa3147e0dd545857b (patch) | |
| tree | 40bfcb516ecf29826978a024fe7d50a04f56151f /usr.sbin/i4b | |
| parent | 096bd8d35a3c52e57d092d6a3af9026c905d68d7 (diff) | |
| download | FreeBSD-src-8e5ee9b0a99793837e9cdeafa3147e0dd545857b.zip FreeBSD-src-8e5ee9b0a99793837e9cdeafa3147e0dd545857b.tar.gz | |
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
Diffstat (limited to 'usr.sbin/i4b')
| -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 644df2f..bc4fc38 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 7be43b9..2eb82d4 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 |
