nacl-no-untar.patch

   1 --- chromium-browser-33.0.1750.117/native_client/build/untrusted.gypi   2014-02-28 09:05:36.555378590 +0200
   2 +++ chromium-browser-33.0.1750.117.patched/native_client/build/untrusted.gypi   2014-02-27 23:15:49.506025570 +0200
   3 @@ -246,7 +246,7 @@
   4                   'action': [
   5                     'python',
   6                     '<(DEPTH)/native_client/build/build_nexe.py',
   7 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
   8 +                   '-t', '<(DEPTH)/native_client/toolchain/',
   9                     '>@(extra_args)',
  10                     '--arch', 'x86-64',
  11                     '--build', 'newlib_nexe',
  12 @@ -289,7 +289,7 @@
  13                   'action': [
  14                     'python',
  15                     '<(DEPTH)/native_client/build/build_nexe.py',
  16 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
  17 +                   '-t', '<(DEPTH)/native_client/toolchain/',
  18                     '>@(extra_args)',
  19                     '--arch', 'x86-64',
  20                     '--build', 'newlib_nlib',
  21 @@ -332,7 +332,7 @@
  22                   'action': [
  23                     'python',
  24                     '<(DEPTH)/native_client/build/build_nexe.py',
  25 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
  26 +                   '-t', '<(DEPTH)/native_client/toolchain/',
  27                     '>@(extra_args)',
  28                     '--arch', 'x86-64',
  29                     '--build', 'newlib_nexe_pnacl',
  30 @@ -376,7 +376,7 @@
  31                   'action': [
  32                     'python',
  33                     '<(DEPTH)/native_client/build/build_nexe.py',
  34 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
  35 +                   '-t', '<(DEPTH)/native_client/toolchain/',
  36                     '>@(extra_args)',
  37                     '--arch', 'x86-64',
  38                     '--build', 'newlib_nlib_pnacl',
  39 @@ -420,7 +420,7 @@
  40                   'action': [
  41                     'python',
  42                     '<(DEPTH)/native_client/build/build_nexe.py',
  43 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
  44 +                   '-t', '<(DEPTH)/native_client/toolchain/',
  45                     '>@(extra_args)',
  46                     '--arch', 'x86-32',
  47                     '--build', 'newlib_nexe',
  48 @@ -463,7 +463,7 @@
  49                   'action': [
  50                     'python',
  51                     '<(DEPTH)/native_client/build/build_nexe.py',
  52 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
  53 +                   '-t', '<(DEPTH)/native_client/toolchain/',
  54                     '>@(extra_args)',
  55                     '--arch', 'x86-32',
  56                     '--build', 'newlib_nlib',
  57 @@ -506,7 +506,7 @@
  58                   'action': [
  59                     'python',
  60                     '<(DEPTH)/native_client/build/build_nexe.py',
  61 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
  62 +                   '-t', '<(DEPTH)/native_client/toolchain/',
  63                     '>@(extra_args)',
  64                     '--arch', 'x86-32',
  65                     '--build', 'newlib_nexe',
  66 @@ -549,7 +549,7 @@
  67                   'action': [
  68                     'python',
  69                     '<(DEPTH)/native_client/build/build_nexe.py',
  70 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
  71 +                   '-t', '<(DEPTH)/native_client/toolchain/',
  72                     '>@(extra_args)',
  73                     '--arch', 'x86-32',
  74                     '--build', 'newlib_nlib',
  75 @@ -598,7 +598,7 @@
  76                  'action': [
  77                    'python',
  78                    '<(DEPTH)/native_client/build/build_nexe.py',
  79 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
  80 +                  '-t', '<(DEPTH)/native_client/toolchain/',
  81                    '>@(extra_args)',
  82                    '--arch', 'arm',
  83                    '--build', 'newlib_nexe',
  84 @@ -641,7 +641,7 @@
  85                  'action': [
  86                    'python',
  87                    '<(DEPTH)/native_client/build/build_nexe.py',
  88 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
  89 +                  '-t', '<(DEPTH)/native_client/toolchain/',
  90                    '>@(extra_args)',
  91                    '--arch', 'arm',
  92                    '--build', 'newlib_nlib',
  93 @@ -684,7 +684,7 @@
  94                  'action': [
  95                    'python',
  96                    '<(DEPTH)/native_client/build/build_nexe.py',
  97 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
  98 +                  '-t', '<(DEPTH)/native_client/toolchain/',
  99                    '>@(extra_args)',
 100                    '--arch', 'arm',
 101                    '--build', 'newlib_nexe',
 102 @@ -727,7 +727,7 @@
 103                  'action': [
 104                    'python',
 105                    '<(DEPTH)/native_client/build/build_nexe.py',
 106 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 107 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 108                    '>@(extra_args)',
 109                    '--arch', 'arm',
 110                    '--build', 'newlib_nlib',
 111 @@ -772,7 +772,7 @@
 112                  'action': [
 113                    'python',
 114                    '<(DEPTH)/native_client/build/build_nexe.py',
 115 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 116 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 117                    '>@(extra_args)',
 118                    '--arch', 'arm',
 119                    '--build', 'newlib_nlib_pnacl',
 120 @@ -821,7 +821,7 @@
 121                  'action': [
 122                    'python',
 123                    '<(DEPTH)/native_client/build/build_nexe.py',
 124 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 125 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 126                    '>@(extra_args)',
 127                    '--arch', 'mips',
 128                    '--build', 'newlib_nexe',
 129 @@ -864,7 +864,7 @@
 130                  'action': [
 131                    'python',
 132                    '<(DEPTH)/native_client/build/build_nexe.py',
 133 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 134 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 135                    '>@(extra_args)',
 136                    '--arch', 'mips',
 137                    '--build', 'newlib_nlib',
 138 @@ -907,7 +907,7 @@
 139                  'action': [
 140                    'python',
 141                    '<(DEPTH)/native_client/build/build_nexe.py',
 142 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 143 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 144                    '>@(extra_args)',
 145                    '--arch', 'mips',
 146                    '--build', 'newlib_nexe',
 147 @@ -950,7 +950,7 @@
 148                  'action': [
 149                    'python',
 150                    '<(DEPTH)/native_client/build/build_nexe.py',
 151 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 152 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 153                    '>@(extra_args)',
 154                    '--arch', 'mips',
 155                    '--build', 'newlib_nlib',
 156 @@ -999,7 +999,7 @@
 157                   'action': [
 158                     'python',
 159                     '<(DEPTH)/native_client/build/build_nexe.py',
 160 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 161 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 162                     '>@(extra_args)',
 163                     '--arch', 'x86-64',
 164                     '--build', 'glibc_nexe',
 165 @@ -1042,7 +1042,7 @@
 166                   'action': [
 167                     'python',
 168                     '<(DEPTH)/native_client/build/build_nexe.py',
 169 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 170 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 171                     '>@(extra_args)',
 172                     '--arch', 'x86-32',
 173                     '--build', 'glibc_nexe',
 174 @@ -1085,7 +1085,7 @@
 175                   'action': [
 176                     'python',
 177                     '<(DEPTH)/native_client/build/build_nexe.py',
 178 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 179 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 180                     '>@(extra_args)',
 181                     '--arch', 'x86-64',
 182                     '--build', 'glibc_nlib',
 183 @@ -1128,7 +1128,7 @@
 184                   'action': [
 185                     'python',
 186                     '<(DEPTH)/native_client/build/build_nexe.py',
 187 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 188 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 189                     '>@(extra_args)',
 190                     '--arch', 'x86-32',
 191                     '--build', 'glibc_nlib',
 192 @@ -1172,7 +1172,7 @@
 193                     'python',
 194                     '<(DEPTH)/native_client/build/build_nexe.py',
 195                     '>@(extra_args)',
 196 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 197 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 198                     '--arch', 'x86-64',
 199                     '--build', 'glibc_nso',
 200                     '--root', '<(DEPTH)',
 201 @@ -1215,7 +1215,7 @@
 202                     'python',
 203                     '<(DEPTH)/native_client/build/build_nexe.py',
 204                     '>@(extra_args)',
 205 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 206 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 207                     '--arch', 'x86-32',
 208                     '--build', 'glibc_nso',
 209                     '--root', '<(DEPTH)',
 210 @@ -1304,7 +1304,7 @@
 211              'action': [
 212                'python',
 213                '<(DEPTH)/native_client/build/build_nexe.py',
 214 -              '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 215 +              '-t', '<(DEPTH)/native_client/toolchain/',
 216                '>@(extra_args)',
 217                '--arch', 'pnacl',
 218                '--build', 'newlib_pexe',
 219 @@ -1335,7 +1335,7 @@
 220                  'action' : [
 221                    'python',
 222                    '<(DEPTH)/native_client/build/build_nexe.py',
 223 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 224 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 225                    '--arch', 'x86-32',
 226                    '--build', 'newlib_translate',
 227                    '--root', '<(DEPTH)',
 228 @@ -1360,7 +1360,7 @@
 229                  'action' : [
 230                    'python',
 231                    '<(DEPTH)/native_client/build/build_nexe.py',
 232 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 233 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 234                    '--arch', 'x86-64',
 235                    '--build', 'newlib_translate',
 236                    '--root', '<(DEPTH)',
 237 @@ -1385,7 +1385,7 @@
 238                  'action' : [
 239                    'python',
 240                    '<(DEPTH)/native_client/build/build_nexe.py',
 241 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 242 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 243                    '--arch', 'arm',
 244                    '--build', 'newlib_translate',
 245                    '--root', '<(DEPTH)',
 246 @@ -1423,7 +1423,7 @@
 247              'action': [
 248                'python',
 249                '<(DEPTH)/native_client/build/build_nexe.py',
 250 -              '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 251 +              '-t', '<(DEPTH)/native_client/toolchain/',
 252                '>@(extra_args)',
 253                '--arch', 'pnacl',
 254                '--build', 'newlib_plib',
 255 --- chromium-browser-33.0.1750.117/native_client/tools.gyp      2014-02-20 22:29:12.000000000 +0200
 256 +++ chromium-browser-33.0.1750.117.patched/native_client/tools.gyp      2014-02-27 19:27:23.085288396 +0200
 257 @@ -64,6 +64,17 @@
 258          'arm_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_arm_newlib',
 259        },
 260        'conditions': [
 261 +        # create stamp.untar that build system depends on
 262 +        ['disable_newlib==0 and disable_newlib_untar==1', {
 263 +          'actions': [
 264 +           {
 265 +              'action_name': 'Touch newlib',
 266 +              'outputs': ['>(newlib_dir)/stamp.untar'],
 267 +              'inputs': [], # input is required. so let it be empty
 268 +              'action': ['touch', '<@(_outputs)'],
 269 +          },
 270 +          ],
 271 +        }],
 272          ['disable_newlib==0 and disable_newlib_untar==0', {
 273            'actions': [
 274              {
 275 --- chromium-browser-24.0.1312.45/native_client/build/untrusted.gypi    2013-01-01 23:08:43.214443900 +0200
 276 +++ chromium-browser-24.0.1312.45-almost-there/native_client/build/untrusted.gypi       2013-01-01 22:50:53.863859341 +0200
 277 @@ -142,6 +142,8 @@
 278               'variables': {
 279                  'tool_name': 'newlib',
 280                  'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
 281 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
 282 +                'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
 283                  'out_newlib64%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x64.nexe',
 284                  'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)',
 285                  'source_list_newlib64%': '<(tool_name)-x86-64.>(_target_name).source_list.gypcmd',
 286 @@ -169,11 +171,14 @@
 287                     '--root', '<(DEPTH)',
 288                     '--name', '>(out_newlib64)',
 289                     '--objdir', '>(objdir_newlib64)',
 290 -                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
 291 +# FIXED
 292 +                   '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)',
 293                     '--lib-dirs=>(lib_dirs_newlib64) ',
 294                     '--compile_flags=-m64 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
 295                     '--defines=^(defines) >(_defines)',
 296 -                   '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64 ^(link_flags) >(_link_flags)',
 297 +# -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64
 298 +# ./src/out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/x86_64-nacl/lib/crt1.o
 299 +                   '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64 -B<(newlib_dir)/lib ^(link_flags) >(_link_flags)',
 300                     '--source-list=^|(<(source_list_newlib64) ^(_sources) ^(sources))',
 301                   ],
 302                 },
 303 @@ -183,6 +188,8 @@
 304               'variables': {
 305                  'tool_name': 'newlib',
 306                  'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
 307 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
 308 +                'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
 309                  'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)',
 310                  'source_list_newlib64%': '<(tool_name)-x86-64.>(_target_name).source_list.gypcmd',
 311                  'out_newlib64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib64/>(nlib_target)',
 312 @@ -210,7 +217,19 @@
 313                     '--root', '<(DEPTH)',
 314                     '--name', '>(out_newlib64)',
 315                     '--objdir', '>(objdir_newlib64)',
 316 -                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
 317 +#XXX
 318 +#glen@carme-pld src/base $ find .. -name semaphore.h
 319 +#../native_client/src/untrusted/pthread/semaphore.h
 320 +#../native_client_sdk/src/libraries/third_party/pthreads-win32/semaphore.h
 321 +#../out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/x86_64-nacl/include/semaphore.h
 322 +#../out/Release/obj/gen/sdk/toolchain/linux_x86_pnacl/newlib/sdk/include/include/semaphore.h
 323 +#
 324 +#-I/home/users/glen/rpm/packages/chromium-browser/autoupdate/beta/BU
 325 +#ILD/chromium-browser-24.0.1312.45/src/out/Release/obj/gen/tc_newlib/include
 326 +#                'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
 327 +#                              'newlib_dir__': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib',
 328 +
 329 +                   '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)',
 330                     '--lib-dirs=>(lib_dirs_newlib64) ',
 331                     '--compile_flags=-m64 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
 332                     '--defines=^(defines) >(_defines)',
 333 @@ -224,6 +243,8 @@
 334               'variables': {
 335                  'tool_name': 'newlib',
 336                  'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
 337 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
 338 +                'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
 339                  'out_newlib32%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x32.nexe',
 340                  'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)',
 341                  'source_list_newlib32%': '<(tool_name)-x86-32.>(_target_name).source_list.gypcmd',
 342 @@ -251,11 +272,12 @@
 343                     '--root', '<(DEPTH)',
 344                     '--name', '>(out_newlib32)',
 345                     '--objdir', '>(objdir_newlib32)',
 346 -                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
 347 +# FIXED
 348 +                   '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)',
 349                     '--lib-dirs=>(lib_dirs_newlib32)',
 350                     '--compile_flags=-m32 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
 351                     '--defines=^(defines) >(_defines)',
 352 -                   '--link_flags=-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32 ^(link_flags) >(_link_flags)',
 353 +                   '--link_flags=-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32 -B<(newlib_dir)/lib ^(link_flags) >(_link_flags)',
 354                     '--source-list=^|(<(source_list_newlib32) ^(_sources) ^(sources))',
 355                   ],
 356                 },
 357 @@ -265,6 +287,8 @@
 358               'variables': {
 359                  'tool_name': 'newlib',
 360                  'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
 361 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
 362 +                'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
 363                  'out_newlib32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib32/>(nlib_target)',
 364                  'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)',
 365                  'source_list_newlib32%': '<(tool_name)-x86-32.>(_target_name).source_list.gypcmd',
 366 @@ -292,7 +316,8 @@
 367                     '--root', '<(DEPTH)',
 368                     '--name', '>(out_newlib32)',
 369                     '--objdir', '>(objdir_newlib32)',
 370 -                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
 371 +# FIXED
 372 +                   '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)',
 373                     '--lib-dirs=>(lib_dirs_newlib32)',
 374                     '--compile_flags=-m32 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
 375                     '--defines=^(defines) >(_defines)',
 376 Could not find toolchain prep stamp file: ../native_client/toolchain/linux_x86_newlib/stamp.prep
 377 Could not find toolchain prep stamp file: ../native_client/toolchain/linux_x86_newlib/stamp.prep
 378 make: *** [out/Release/obj/gen/tc_newlib/lib32/crtn.o] Error 1
 379 make: *** Waiting for unfinished jobs....
 380 make: *** [out/Release/obj/gen/tc_newlib/lib32/crti.o] Error 1
 381 --- chromium-browser-33.0.1750.117/native_client/build/build_nexe.py    2014-02-20 22:28:56.000000000 +0200
 382 +++ chromium-browser-33.0.1750.117.patched/native_client/build/build_nexe.py    2014-02-27 19:27:23.085288396 +0200
 383 @@ -251,9 +251,6 @@
 384      # Set the toolchain directories
 385      self.toolchain = os.path.join(options.toolpath, tooldir)
 386      self.toolbin = os.path.join(self.toolchain, 'bin')
 387 -    self.toolstamp = os.path.join(self.toolchain, 'stamp.prep')
 388 -    if not IsFile(self.toolstamp):
 389 -      raise Error('Could not find toolchain prep stamp file: ' + self.toolstamp)
 390
 391      self.inc_paths = ArgToList(options.incdirs)
 392      self.lib_paths = ArgToList(options.libdirs)
 393 @@ -465,10 +462,6 @@
 394      return path
 395
 396    def NeedsRebuild(self, outd, out, src, rebuilt=False):
 397 -    if not IsFile(self.toolstamp):
 398 -      if rebuilt:
 399 -        raise Error('Could not find toolchain stamp file %s.' % self.toolstamp)
 400 -      return True
 401      if not IsFile(outd):
 402        if rebuilt:
 403          raise Error('Could not find dependency file %s.' % outd)
 404 @@ -477,15 +470,9 @@
 405        if rebuilt:
 406          raise Error('Could not find output file %s.' % out)
 407        return True
 408 -    stamp_tm = GetMTime(self.toolstamp)
 409      out_tm = GetMTime(out)
 410      outd_tm = GetMTime(outd)
 411      src_tm = GetMTime(src)
 412 -    if IsStale(out_tm, stamp_tm, rebuilt):
 413 -      if rebuilt:
 414 -        raise Error('Output %s is older than toolchain stamp %s' % (
 415 -            out, self.toolstamp))
 416 -      return True
 417      if IsStale(out_tm, src_tm, rebuilt):
 418        if rebuilt:
 419          raise Error('Output %s is older than source %s.' % (out, src))