Changeset 47c1928


Ignore:
Timestamp:
Aug 10, 2018, 5:45:51 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
ae628e1
Parents:
2ea0a8a
Message:

Host now properly affects compiler

Files:
15 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    r2ea0a8a r47c1928  
    284284EXEEXT = @EXEEXT@
    285285GREP = @GREP@
     286HOST_FLAGS = @HOST_FLAGS@
    286287INSTALL = @INSTALL@
    287288INSTALL_DATA = @INSTALL_DATA@
  • benchmark/Makefile.in

    r2ea0a8a r47c1928  
    168168EXEEXT = @EXEEXT@
    169169GREP = @GREP@
     170HOST_FLAGS = @HOST_FLAGS@
    170171INSTALL = @INSTALL@
    171172INSTALL_DATA = @INSTALL_DATA@
  • configure

    r2ea0a8a r47c1928  
    668668LIBCFA_TARGET_DIRS
    669669TARGET_HOSTS
     670HOST_FLAGS
    670671host_os
    671672host_vendor
     
    34113412
    34123413
     3414if ! test "$host_cpu" = "$build_cpu"; then
     3415        case $host_cpu in
     3416                i386)
     3417                        HOST_FLAGS="-m32"
     3418                        ;;
     3419                i686)
     3420                        HOST_FLAGS="-m32"
     3421                        ;;
     3422                x86_64)
     3423                        HOST_FLAGS="-m64"
     3424                        ;;
     3425        esac
     3426fi
     3427
     3428
    34133429default_target="${host_cpu}:debug, ${host_cpu}:nodebug"
    34143430
  • configure.ac

    r2ea0a8a r47c1928  
    121121AC_CANONICAL_HOST
    122122
     123if ! test "$host_cpu" = "$build_cpu"; then
     124        case $host_cpu in
     125                i386)
     126                        HOST_FLAGS="-m32"
     127                        ;;
     128                i686)
     129                        HOST_FLAGS="-m32"
     130                        ;;
     131                x86_64)
     132                        HOST_FLAGS="-m64"
     133                        ;;
     134        esac
     135fi
     136AC_SUBST(HOST_FLAGS)
     137
    123138default_target="${host_cpu}:debug, ${host_cpu}:nodebug"
    124139AC_ARG_WITH(target-hosts,
  • driver/Makefile.am

    r2ea0a8a r47c1928  
    1818
    1919# applies to both programs
    20 AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
     20AM_CXXFLAGS = @HOST_FLAGS@ -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
    2121
    2222# don't install cfa directly
  • driver/Makefile.in

    r2ea0a8a r47c1928  
    213213EXEEXT = @EXEEXT@
    214214GREP = @GREP@
     215HOST_FLAGS = @HOST_FLAGS@
    215216INSTALL = @INSTALL@
    216217INSTALL_DATA = @INSTALL_DATA@
     
    301302
    302303# applies to both programs
    303 AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
     304AM_CXXFLAGS = @HOST_FLAGS@ -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
    304305cfa_SOURCES = cfa.cc
    305306
  • libcfa/configure

    r2ea0a8a r47c1928  
    25742574                cfa_prefix=${prefix}
    25752575        fi
     2576        cfa_prefix="$(readlink -f ${cfa_prefix})/"
    25762577
    25772578cat >>confdefs.h <<_ACEOF
     
    25872588                cfa_incdir=${includedir}
    25882589        fi
     2590        cfa_incdir="$(readlink -f ${cfa_incdir})/"
    25892591
    25902592cat >>confdefs.h <<_ACEOF
     
    26002602                cfa_bindir=${bindir}
    26012603        fi
     2604        cfa_bindir="$(readlink -f ${cfa_bindir})/"
    26022605
    26032606cat >>confdefs.h <<_ACEOF
     
    26172620                cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
    26182621        fi
     2622        cfa_libdir="$(readlink -f ${cfa_libdir})/"
    26192623
    26202624cat >>confdefs.h <<_ACEOF
  • libcfa/prelude/Makefile.in

    r2ea0a8a r47c1928  
    259259
    260260# create object files in directory with source files
    261 AUTOMAKE_OPTIONS = subdir-objects
     261AUTOMAKE_OPTIONS = foreign subdir-objects
    262262
    263263# put into lib for now
  • src/Makefile.am

    r2ea0a8a r47c1928  
    4848___driver_cfa_cpp_LDADD = -ldl                  # yywrap
    4949
    50 AM_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
    51 AM_LDFLAGS = -Xlinker -export-dynamic
     50AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
     51AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
    5252
    5353MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
  • src/Makefile.in

    r2ea0a8a r47c1928  
    358358EXEEXT = @EXEEXT@
    359359GREP = @GREP@
     360HOST_FLAGS = @HOST_FLAGS@
    360361INSTALL = @INSTALL@
    361362INSTALL_DATA = @INSTALL_DATA@
     
    508509___driver_cfa_cpp_SOURCES = $(SRC)
    509510___driver_cfa_cpp_LDADD = -ldl                  # yywrap
    510 AM_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
    511 AM_LDFLAGS = -Xlinker -export-dynamic
     511AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
     512AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
    512513all: $(BUILT_SOURCES)
    513514        $(MAKE) $(AM_MAKEFLAGS) all-am
  • tests/Makefile.in

    r2ea0a8a r47c1928  
    210210EXEEXT = @EXEEXT@
    211211GREP = @GREP@
     212HOST_FLAGS = @HOST_FLAGS@
    212213INSTALL = @INSTALL@
    213214INSTALL_DATA = @INSTALL_DATA@
  • tests/preempt_longrun/Makefile.in

    r2ea0a8a r47c1928  
    369369EXEEXT = @EXEEXT@
    370370GREP = @GREP@
     371HOST_FLAGS = @HOST_FLAGS@
    371372INSTALL = @INSTALL@
    372373INSTALL_DATA = @INSTALL_DATA@
  • tests/pybin/settings.py

    r2ea0a8a r47c1928  
    5151                        self.target = arch
    5252                        self.cross_compile = True
    53                         try :
    54                                 self.flags = Architecture.CrossCompileFlags[arch]
    55                         except KeyError:
    56                                 print("Cross compilation not available for architecture %s" % arch, file=sys.stderr)
    57                                 sys.exit(1)
    58 
    5953                else:
    6054                        self.target = canonical_host
    6155                        self.cross_compile = False
    62                         self.flags = ""
     56
     57
     58                try :
     59                        self.flags = Architecture.CrossCompileFlags[self.target]
     60                except KeyError:
     61                        print("Cross compilation not available for architecture %s" % self.target, file=sys.stderr)
     62                        sys.exit(1)
    6363
    6464                self.string = self.target
  • tools/Makefile.in

    r2ea0a8a r47c1928  
    218218EXEEXT = @EXEEXT@
    219219GREP = @GREP@
     220HOST_FLAGS = @HOST_FLAGS@
    220221INSTALL = @INSTALL@
    221222INSTALL_DATA = @INSTALL_DATA@
  • tools/prettyprinter/Makefile.in

    r2ea0a8a r47c1928  
    242242EXEEXT = @EXEEXT@
    243243GREP = @GREP@
     244HOST_FLAGS = @HOST_FLAGS@
    244245INSTALL = @INSTALL@
    245246INSTALL_DATA = @INSTALL_DATA@
Note: See TracChangeset for help on using the changeset viewer.