| SConstruct (9812:9265bcff11b7) | SConstruct (9846:a4b5fd8937c9) |
|---|---|
| 1# -*- mode:python -*- 2 3# Copyright (c) 2013 ARM Limited 4# All rights reserved. 5# 6# The license below extends only to copyright in the software and shall 7# not be construed as granting a license to any other intellectual 8# property including but not limited to intellectual property relating --- 616 unchanged lines hidden (view full) --- 625 # is relying on this 626 main.Append(CCFLAGS=['-Wno-tautological-compare', 627 '-Wno-parentheses', 628 '-Wno-self-assign']) 629 630 main.Append(TCMALLOC_CCFLAGS=['-fno-builtin']) 631 632 # On Mac OS X/Darwin we need to also use libc++ (part of XCode) as | 1# -*- mode:python -*- 2 3# Copyright (c) 2013 ARM Limited 4# All rights reserved. 5# 6# The license below extends only to copyright in the software and shall 7# not be construed as granting a license to any other intellectual 8# property including but not limited to intellectual property relating --- 616 unchanged lines hidden (view full) --- 625 # is relying on this 626 main.Append(CCFLAGS=['-Wno-tautological-compare', 627 '-Wno-parentheses', 628 '-Wno-self-assign']) 629 630 main.Append(TCMALLOC_CCFLAGS=['-fno-builtin']) 631 632 # On Mac OS X/Darwin we need to also use libc++ (part of XCode) as |
| 633 # opposed to libstdc++ to make the transition from TR1 to 634 # C++11. See http://libcxx.llvm.org. However, clang has chosen a 635 # strict implementation of the C++11 standard, and does not allow 636 # incomplete types in template arguments (besides unique_ptr and 637 # shared_ptr), and the libc++ STL containers create problems in 638 # combination with the current gem5 code. For now, we stick with 639 # libstdc++ and use the TR1 namespace. 640 # if sys.platform == "darwin": 641 # main.Append(CXXFLAGS=['-stdlib=libc++']) | 633 # opposed to libstdc++, as the later is dated. 634 if sys.platform == "darwin": 635 main.Append(CXXFLAGS=['-stdlib=libc++']) 636 main.Append(LIBS=['c++']) |
| 642 643else: 644 print termcap.Yellow + termcap.Bold + 'Error' + termcap.Normal, 645 print "Don't know what compiler options to use for your compiler." 646 print termcap.Yellow + ' compiler:' + termcap.Normal, main['CXX'] 647 print termcap.Yellow + ' version:' + termcap.Normal, 648 if not CXX_version: 649 print termcap.Yellow + termcap.Bold + "COMMAND NOT FOUND!" +\ --- 610 unchanged lines hidden --- | 637 638else: 639 print termcap.Yellow + termcap.Bold + 'Error' + termcap.Normal, 640 print "Don't know what compiler options to use for your compiler." 641 print termcap.Yellow + ' compiler:' + termcap.Normal, main['CXX'] 642 print termcap.Yellow + ' version:' + termcap.Normal, 643 if not CXX_version: 644 print termcap.Yellow + termcap.Bold + "COMMAND NOT FOUND!" +\ --- 610 unchanged lines hidden --- |