diff options
| author | Peter Powell <petpow@saberuk.com> | 2013-07-04 08:28:26 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2013-07-05 07:12:02 +0100 |
| commit | f52123b1ed0b1bd96db2282f04f0e5852a50d782 (patch) | |
| tree | c2b59abb1fccfa30368d2c009480763b73d0ca17 | |
| parent | 27ae66eb3fb7056570936e7f4655ec3128bac2a7 (diff) | |
Purge --with-cc in favour of the CXX environment variable.
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | make/configure.pm | 2 |
2 files changed, 3 insertions, 7 deletions
@@ -56,7 +56,7 @@ use make::configure; our ($opt_use_gnutls, $opt_use_openssl, $opt_nointeractive, $opt_ports, $opt_epoll, $opt_kqueue, $opt_noports, $opt_noepoll, $opt_nokqueue, $opt_freebsd_port, $opt_system, $opt_uid); -our ($opt_cc, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, $opt_data_dir, $opt_log_dir); +our ($opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, $opt_data_dir, $opt_log_dir); sub list_extras (); @@ -79,7 +79,6 @@ GetOptions ( 'disable-ports' => \$opt_noports, 'disable-epoll' => \$opt_noepoll, 'disable-kqueue' => \$opt_nokqueue, - 'with-cc=s' => \$opt_cc, 'enable-freebsd-ports-openssl' => \$opt_freebsd_port, 'prefix=s' => \$opt_base_dir, 'config-dir=s' => \$opt_config_dir, @@ -114,7 +113,6 @@ our $interactive = !( (defined $opt_data_dir) || (defined $opt_log_dir) || (defined $opt_nointeractive) || - (defined $opt_cc) || (defined $opt_kqueue) || (defined $opt_epoll) || (defined $opt_ports) || @@ -240,9 +238,9 @@ else { $config{CC} = "g++"; # C++ compiler } -if (defined $opt_cc) +if (defined $ENV{CXX}) { - $config{CC} = $opt_cc; + $config{CC} = $ENV{CXX}; } our $exec = $config{CC} . " -dumpversion | cut -c 1"; chomp($config{GCCVER} = `$exec`); # Major GCC Version diff --git a/make/configure.pm b/make/configure.pm index 2ae9c7fa0..194d439e3 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -295,8 +295,6 @@ InspIRCd 1.0.x, are also allowed. to select() [not set] --disable-kqueue Do not enable kqueue(), fall back to select() [not set] - --with-cc=[filename] Use an alternative compiler to - build InspIRCd [g++] --prefix=[directory] Base directory to install into (if defined, can automatically define config, module, bin and library dirs as subdirectories of prefix) |