Skip to content
Permalink
Browse files

gdal: Don't add -stdlib flag until pre-configure

This port has gcc variants (which change the chosen compiler) so wait
until pre-configure time to inspect the compiler value.

Closes: https://trac.macports.org/ticket/59989
  • Loading branch information
ryandesign authored and Veence committed Jun 29, 2020
1 parent 6abe459 commit b5705597236f14f1c6379a5e60978134a462ae8e
Showing with 5 additions and 7 deletions.
  1. +5 −7 gis/gdal/Portfile
@@ -37,13 +37,6 @@ checksums rmd160 efccd737eae5b4cb996fee9d0b21f485015e24be \

worksrcdir ${worksrcpath}/gdal

platform darwin {
# see https://trac.macports.org/ticket/56517
if {[string match *clang* ${configure.cxx}]} {
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
}

# see https://trac.macports.org/ticket/60625
patchfiles-append patch-charls-configure.diff

@@ -144,6 +137,11 @@ if {${configure.cxx_stdlib} eq "libc++"} {
}

pre-configure {
# see https://trac.macports.org/ticket/56517
if {[string match *clang* ${configure.cxx}]} {
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}

global worksrcpath_dirs
if { ![variant_isset universal] } {
set worksrcpath_dirs ${worksrcpath}

0 comments on commit b570559

Please sign in to comment.
You can’t perform that action at this time.