Print this page
4028 remove CLOSED_IS_PRESENT

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile
          +++ new/usr/src/Makefile
↓ open down ↓ 122 lines elided ↑ open up ↑
 123  123                  cd $$m; pwd; $(MAKE) _msg; cd ..; \
 124  124          done
 125  125  
 126  126  mapfiles: bldtools
 127  127          @cd common/mapfiles; pwd; $(MAKE) install
 128  128  
 129  129  clean clobber: $(SUBDIRS) head pkg
 130  130  
 131  131  closedbins: bldtools $(ROOTDIRS) FRC
 132  132          @CLOSED_ROOT="$$ON_CLOSED_BINS/root_$(MACH)$${RELEASE_BUILD+-nd}"; \
 133      -        if [ "$$CLOSED_IS_PRESENT" = no ]; then \
 134      -                if [ ! -d "$$CLOSED_ROOT" ]; then \
 135      -                        $(ECHO) "Error: ON_CLOSED_BINS must point to closed" \
 136      -                            "binaries."; \
 137      -                        $(ECHO) "root_$(MACH)$${RELEASE_BUILD+-nd} is not" \
 138      -                            "present in $$ON_CLOSED_BINS."; \
 139      -                        exit 1; \
 140      -                fi; \
 141      -                $(ECHO) "Copying closed binaries from $$CLOSED_ROOT"; \
 142      -                (cd $$CLOSED_ROOT; \
 143      -                    $(TAR) cfX - $(CODEMGR_WS)/exception_lists/closed-bins .) | \
 144      -                    (cd $(ROOT); $(TAR) xBpf -); \
 145      -                ( cd $(ROOT); $(CTFSTRIP) $$(cd $$CLOSED_ROOT; $(FIND) \
 146      -                    ./kernel ./usr/kernel ./platform/*/kernel -type f -a -perm -u+x | \
 147      -                    $(EGREP) -vf $(CODEMGR_WS)/exception_lists/closed-bins) ); \
 148      -        fi
      133 +        if [ ! -d "$$CLOSED_ROOT" ]; then \
      134 +                $(ECHO) "Error: ON_CLOSED_BINS must point to closed" \
      135 +                    "binaries."; \
      136 +                $(ECHO) "root_$(MACH)$${RELEASE_BUILD+-nd} is not" \
      137 +                    "present in $$ON_CLOSED_BINS."; \
      138 +                exit 1; \
      139 +        fi; \
      140 +        $(ECHO) "Copying closed binaries from $$CLOSED_ROOT"; \
      141 +        (cd $$CLOSED_ROOT; \
      142 +            $(TAR) cfX - $(CODEMGR_WS)/exception_lists/closed-bins .) | \
      143 +            (cd $(ROOT); $(TAR) xBpf -); \
      144 +        ( cd $(ROOT); $(CTFSTRIP) $$(cd $$CLOSED_ROOT; $(FIND) \
      145 +            ./kernel ./usr/kernel ./platform/*/kernel -type f -a -perm -u+x | \
      146 +            $(EGREP) -vf $(CODEMGR_WS)/exception_lists/closed-bins) )
 149  147  
 150  148  #
 151  149  # Declare what parts can be built in parallel
 152  150  # DUMMY at the end is used in case macro expansion produces an empty string to
 153  151  # prevent everything going in parallel
 154  152  #
 155  153  .PARALLEL: $(PARALLEL_HEADERS) DUMMY
 156  154  .PARALLEL: $(PARALLEL_DIRS) DUMMY
 157  155  
 158  156  $(SUBDIRS) head pkg: FRC
↓ open down ↓ 110 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX