Changeset 04bc1c0


Ignore:
Timestamp:
May 8, 2020, 12:51:59 PM (17 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
Children:
0dedf027
Parents:
af7acb9
Message:

Disable static linking of cfa librairies since it is not used by default and could lead to cfa-cpp being invoked twice.
Static librairies can still be built by configuring with --enable-static

Location:
libcfa
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcfa/configure

    raf7acb9 r04bc1c0  
    790790enable_distcc
    791791with_cfa_name
     792enable_static
    792793enable_shared
    793 enable_static
    794794with_pic
    795795enable_fast_install
     
    14521452  --disable-silent-rules  verbose build output (undo: "make V=0")
    14531453  --enable-distcc     whether or not to enable distributed compilation
     1454  --enable-static[=PKGS]  build static libraries [default=no]
    14541455  --enable-shared[=PKGS]  build shared libraries [default=yes]
    1455   --enable-static[=PKGS]  build static libraries [default=yes]
    14561456  --enable-fast-install[=PKGS]
    14571457                          optimize for fast installation [default=yes]
     
    80308030
    80318031# Set options
     8032# Check whether --enable-static was given.
     8033if test "${enable_static+set}" = set; then :
     8034  enableval=$enable_static; p=${PACKAGE-default}
     8035    case $enableval in
     8036    yes) enable_static=yes ;;
     8037    no) enable_static=no ;;
     8038    *)
     8039     enable_static=no
     8040      # Look at the argument we got.  We use all the common list separators.
     8041      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
     8042      for pkg in $enableval; do
     8043        IFS=$lt_save_ifs
     8044        if test "X$pkg" = "X$p"; then
     8045          enable_static=yes
     8046        fi
     8047      done
     8048      IFS=$lt_save_ifs
     8049      ;;
     8050    esac
     8051else
     8052  enable_static=no
     8053fi
     8054
     8055
     8056
     8057
     8058
     8059
     8060
    80328061
    80338062
     
    80628091fi
    80638092
    8064 
    8065 
    8066 
    8067 
    8068 
    8069 
    8070 
    8071 
    8072   # Check whether --enable-static was given.
    8073 if test "${enable_static+set}" = set; then :
    8074   enableval=$enable_static; p=${PACKAGE-default}
    8075     case $enableval in
    8076     yes) enable_static=yes ;;
    8077     no) enable_static=no ;;
    8078     *)
    8079      enable_static=no
    8080       # Look at the argument we got.  We use all the common list separators.
    8081       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
    8082       for pkg in $enableval; do
    8083         IFS=$lt_save_ifs
    8084         if test "X$pkg" = "X$p"; then
    8085           enable_static=yes
    8086         fi
    8087       done
    8088       IFS=$lt_save_ifs
    8089       ;;
    8090     esac
    8091 else
    8092   enable_static=yes
    8093 fi
    80948093
    80958094
     
    1772817727macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
    1772917728macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
     17729enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    1773017730enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    17731 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    1773217731pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
    1773317732enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
     
    1885718856macro_revision=$macro_revision
    1885818857
     18858# Whether or not to build static libraries.
     18859build_old_libs=$enable_static
     18860
    1885918861# Whether or not to build shared libraries.
    1886018862build_libtool_libs=$enable_shared
    18861 
    18862 # Whether or not to build static libraries.
    18863 build_old_libs=$enable_static
    1886418863
    1886518864# What type of objects to build.
  • libcfa/configure.ac

    raf7acb9 r04bc1c0  
    109109
    110110# Checks for programs.
    111 LT_INIT
     111LT_INIT([disable-static])
    112112
    113113AC_PROG_CXX
Note: See TracChangeset for help on using the changeset viewer.