Changeset b2aaaa0 in mainline


Ignore:
Timestamp:
2018-09-13T10:10:46Z (5 years ago)
Author:
Jiří Zárevúcky <jiri.zarevucky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
09ab0a9a
Parents:
83932dc9
Message:

Remove duplicate cc_args from autotool.py, fix mips

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tools/autotool.py

    r83932dc9 rb2aaaa0  
    179179        platform = None
    180180        target = None
    181         cc_args = []
    182181
    183182        if (config['PLATFORM'] == "abs32le"):
     
    192191
    193192                if (config['CROSS_TARGET'] == "mips32"):
    194                         cc_args.append("-mabi=32")
    195193                        target = "mipsel-helenos"
    196194
     
    213211        if (config['PLATFORM'] == "mips32"):
    214212                check_config(config, "MACHINE")
    215                 cc_args.append("-mabi=32")
    216213
    217214                if ((config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")):
     
    225222        if (config['PLATFORM'] == "mips64"):
    226223                check_config(config, "MACHINE")
    227                 cc_args.append("-mabi=64")
    228224
    229225                if (config['MACHINE'] == "msim"):
     
    243239                target = "sparc64-helenos"
    244240
    245         return (platform, cc_args, target)
     241        return (platform, target)
    246242
    247243def check_app(args, name, details):
     
    359355        return int(value, base)
    360356
    361 def probe_compiler(common, typesizes):
     357def probe_compiler(cc, common, typesizes):
    362358        "Generate, compile and parse probing source"
    363359
     
    377373        outf.close()
    378374
    379         args = common['CC_AUTOGEN'].split(' ')
     375        args = cc.split(' ')
    380376        args.extend(["-S", "-o", PROBE_OUTPUT, PROBE_SOURCE])
    381377
     
    564560                check_app(["tar", "--version"], "tar utility", "usually part of tar")
    565561
    566                 platform, cc_args, target = get_target(config)
     562                platform, target = get_target(config)
    567563
    568564                if (platform is None) or (target is None):
     
    577573                common['TARGET'] = target
    578574                prefix = "%s-" % target
     575
     576                cc_autogen = None
    579577
    580578                # Compiler
     
    584582
    585583                        check_common(common, "GCC")
    586                         common['CC'] = " ".join([common['GCC']] + cc_args)
    587                         common['CC_AUTOGEN'] = common['CC']
     584                        common['CC'] = common['GCC']
     585                        cc_autogen = common['CC']
    588586
    589587                        check_common(common, "GXX")
     
    595593
    596594                        check_common(common, "CLANG")
    597                         common['CC'] = " ".join([common['CLANG']] + cc_args)
    598                         common['CC_AUTOGEN'] = common['CC'] + " -no-integrated-as"
     595                        common['CC'] = common['CLANG']
     596                        cc_autogen = common['CC'] + " -no-integrated-as"
    599597
    600598                        if (config['INTEGRATED_AS'] == "yes"):
     
    610608                                common['GENISOIMAGE'] += ' -as genisoimage'
    611609
    612                 probe = probe_compiler(common,
     610                probe = probe_compiler(cc_autogen, common,
    613611                        [
    614612                                {'type': 'long long int', 'tag': 'LONG_LONG', 'sname': 'LLONG' },
  • uspace/lib/posix/Makefile

    r83932dc9 rb2aaaa0  
    102102        echo '# Generated file, do not modify.' >> $@.new
    103103        echo '# Do not forget to set HELENOS_EXPORT_ROOT.' >> $@.new
    104         echo 'HELENOS_CROSS_PATH="$(shell dirname `which "$(CC)"`)"' >> $@.new
     104        echo 'HELENOS_CROSS_PATH="$(shell dirname `which $(CC)`)"' >> $@.new
    105105        echo 'HELENOS_ARCH="$(firstword $(subst -, ,$(TARGET)))"' >> $@.new
    106106        echo 'HELENOS_TARGET="$(TARGET)"' >> $@.new
Note: See TracChangeset for help on using the changeset viewer.