diff options
author | Richard Lowe <richlowe@richlowe.net> | 2021-02-11 15:01:40 -0600 |
---|---|---|
committer | Richard Lowe <richlowe@richlowe.net> | 2021-02-20 16:14:32 -0600 |
commit | 3aa6c13072f3d4792a18693e916aed260a496c1f (patch) | |
tree | 443eae60dcdecc4c71c7834204a07b7ba1100f98 /usr/src/uts | |
parent | 1f0845f1dfb179d6aa598ad89bb44d432f4e1020 (diff) | |
download | illumos-joyent-3aa6c13072f3d4792a18693e916aed260a496c1f.tar.gz |
13558 remove support for optional subdirectories in the build
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Yuri Pankov <yuripv@yuripv.dev>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr/src/uts')
-rw-r--r-- | usr/src/uts/i86pc/Makefile | 6 | ||||
-rw-r--r-- | usr/src/uts/i86xpv/Makefile | 6 | ||||
-rw-r--r-- | usr/src/uts/intel/Makefile | 6 | ||||
-rw-r--r-- | usr/src/uts/sparc/Makefile | 6 | ||||
-rw-r--r-- | usr/src/uts/sun4u/Makefile | 6 | ||||
-rw-r--r-- | usr/src/uts/sun4v/Makefile | 14 |
6 files changed, 6 insertions, 38 deletions
diff --git a/usr/src/uts/i86pc/Makefile b/usr/src/uts/i86pc/Makefile index 1638d050df..ec0f61cfb4 100644 --- a/usr/src/uts/i86pc/Makefile +++ b/usr/src/uts/i86pc/Makefile @@ -79,11 +79,7 @@ $(IMPLEMENTATIONS): FRC @cd $@; pwd; THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET) $(XMODS): FRC - @if [ -f $@/Makefile ]; then \ - cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \ - else \ - true; \ - fi + cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) install_h check: $(IMPLEMENTATIONS) FRC @cd sys; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/uts/i86xpv/Makefile b/usr/src/uts/i86xpv/Makefile index ba2927dfa6..2b62799664 100644 --- a/usr/src/uts/i86xpv/Makefile +++ b/usr/src/uts/i86xpv/Makefile @@ -74,11 +74,7 @@ setup: FRC @cd cpu/scripts; pwd; $(MAKE) $(TARGET) $(XMODS): FRC - @if [ -f $@/Makefile ]; then \ - cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \ - else \ - true; \ - fi + cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) install_h check: FRC @cd sys; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile index 46f0fb2be1..ff9ed42c94 100644 --- a/usr/src/uts/intel/Makefile +++ b/usr/src/uts/intel/Makefile @@ -115,11 +115,7 @@ $(KMODS) $(SUBDIRS) config: FRC @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) $(XMODS): FRC - @if [ -f $@/Makefile ]; then \ - cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \ - else \ - true; \ - fi + cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) install_h check: FRC @cd sys; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/uts/sparc/Makefile b/usr/src/uts/sparc/Makefile index 6fe0be4ce9..f9df68dbc3 100644 --- a/usr/src/uts/sparc/Makefile +++ b/usr/src/uts/sparc/Makefile @@ -55,11 +55,7 @@ $(KMODS) config: FRC @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) $(XMODS): FRC - @if [ -f $@/Makefile ]; then \ - cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \ - else \ - true; \ - fi + cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) install_h check: FRC @cd asm; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/uts/sun4u/Makefile b/usr/src/uts/sun4u/Makefile index 7da95236ca..4ceb2d38d8 100644 --- a/usr/src/uts/sun4u/Makefile +++ b/usr/src/uts/sun4u/Makefile @@ -153,11 +153,7 @@ $(IMPLEMENTATIONS): FRC @cd $@; pwd; THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET) $(XMODS): FRC - @if [ -f $@/Makefile ]; then \ - cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \ - else \ - true; \ - fi + cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) install_h check: install_platforms $(IMPLEMENTATIONS) @cd sys; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/uts/sun4v/Makefile b/usr/src/uts/sun4v/Makefile index 8b09c1e732..4e1ac2a6da 100644 --- a/usr/src/uts/sun4v/Makefile +++ b/usr/src/uts/sun4v/Makefile @@ -83,19 +83,7 @@ $(IMPLEMENTATIONS): FRC @cd $@; pwd; THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET) $(XMODS): FRC - @if [ -f $@/Makefile ]; then \ - cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \ - else \ - true; \ - fi - -$(CLOSED_XMODS): FRC - @if [ -f $(CLOSED)/uts/sun4v/$@/Makefile ]; then \ - cd $(CLOSED)/uts/sun4v/$@; pwd; \ - $(MAKE) $(NO_STATE) $(TARGET); \ - else \ - true; \ - fi + cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) $(CLOSED_KMODS): FRC cd $(CLOSED)/uts/sun4v/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET) |