diff options
| author | Jonathan Adams <Jonathan.Adams@Sun.COM> | 2009-09-22 17:11:45 -0700 |
|---|---|---|
| committer | Jonathan Adams <Jonathan.Adams@Sun.COM> | 2009-09-22 17:11:45 -0700 |
| commit | b1e09399a2b6d3537c333f4eabdbcade2437a0be (patch) | |
| tree | de08139b672421afb1f2fa1f4a7692cc48857863 /usr/src | |
| parent | d20e665c84abf083a9e8b62cca93383ecb55afdf (diff) | |
| download | illumos-joyent-b1e09399a2b6d3537c333f4eabdbcade2437a0be.tar.gz | |
6851295 Need better CTF control macros
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/Makefile.uts | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts index 443518fee7..22262aef03 100644 --- a/usr/src/uts/Makefile.uts +++ b/usr/src/uts/Makefile.uts @@ -316,8 +316,17 @@ CTFMERGE_GENUNIX = \ # built will be used as the label. If no ID is available, or if patch mode # is not being used, the value of $VERSION will be used. # +# For the ease of developers dropping modules onto possibly unrelated systems, +# you can set NO_GENUNIX_MERGE= in the environment to skip uniquifying against +# genunix. +# +NO_GENUNIX_UNIQUIFY=$(POUND_SIGN) +SKIP_GENUNIX_UNIQUIFY=no +$(NO_GENUNIX_UNIQUIFY)SKIP_GENUNIX_UNIQUIFY=yes + CTFMERGE_UNIQUIFY_AGAINST_GENUNIX = \ @label="-L VERSION" ; \ + uniq= ; \ if [ -z "$(PATCH_BUILD)" ] ; then \ uniq="-D BASE" ; \ set -- `$(CTFFINDMOD) -n -r -t $(PMTMO_FILE) $@` ; \ @@ -328,10 +337,15 @@ CTFMERGE_UNIQUIFY_AGAINST_GENUNIX = \ fi ; \ fi ; \ fi ; \ - mergecmd="$(CTFMERGE) $(CTFMRGFLAGS)" ; \ - cmd="$$mergecmd $$label -d $(CTFMERGE_GENUNIX) $$uniq -o $@" ; \ - echo $$cmd "$(OBJECTS) $(CTFEXTRAOBJS)" ; \ - $$cmd $(OBJECTS) $(CTFEXTRAOBJS) + if [ "$(SKIP_GENUNIX_UNIQUIFY)" = "yes" ]; then \ + uniq= ; \ + else \ + uniq="-d $(CTFMERGE_GENUNIX) $$uniq" ; \ + fi ; \ + cmd="$(CTFMERGE) $(CTFMRGFLAGS) $$label $$uniq" ; \ + cmd="$$cmd -o $@ $(OBJECTS) $(CTFEXTRAOBJS)" ; \ + echo $$cmd ; \ + $$cmd # # Used to merge the genunix module. genunix has special requirements in |