Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Always set cxx_stdlib_overridden when installing
Use information from the Portfile if it's not in the archive.
  • Loading branch information
jmroot committed Jun 1, 2018
1 parent fbb81ed commit a514690
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/macports1.0/macports.tcl
Expand Up @@ -4697,8 +4697,10 @@ proc macports::revupgrade_update_cxx_stdlib {fancy_output {revupgrade_progress "
lappend binary_files [$filehandle actual_path]
}
$maybe_port cxx_stdlib [get_actual_cxx_stdlib $binary_files]
# can't tell after the fact, assume not overridden
$maybe_port cxx_stdlib_overridden 0
if {[catch {$maybe_port cxx_stdlib_overridden}]} {
# can't tell after the fact, assume not overridden
$maybe_port cxx_stdlib_overridden 0
}
}
}
if {$fancy_output} {
Expand Down
4 changes: 4 additions & 0 deletions src/port1.0/portinstall.tcl
Expand Up @@ -391,6 +391,10 @@ proc portinstall::install_main {args} {
if {${portinstall::actual_cxx_stdlib} ne ""} {
$regref cxx_stdlib ${portinstall::actual_cxx_stdlib}
$regref cxx_stdlib_overridden ${portinstall::cxx_stdlib_overridden}
} else {
# no info in the archive
global configure.cxx_stdlib cxx_stdlib
$regref cxx_stdlib_overridden [expr {${configure.cxx_stdlib} ne $cxx_stdlib}]
}
# Trick to have a portable GMT-POSIX epoch-based time.
$regref date [expr {[clock scan now -gmt true] - [clock scan "1970-1-1 00:00:00" -gmt true]}]
Expand Down

0 comments on commit a514690

Please sign in to comment.