X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92ea30ce148ba925c68fef6fdfe5e7dbd93bd346..8f7d7be8171a8222ccf11b276b931505893ccbed:/wx-config.in diff --git a/wx-config.in b/wx-config.in index b2795189cf..492c8b3de1 100755 --- a/wx-config.in +++ b/wx-config.in @@ -339,6 +339,9 @@ get_mask() eval echo "\${$1_host}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}-\${$1_debugtype}\${$1_linkage}-\${$1_version}\${$1_flavour}" } +# Returns true if this script is for a cross compiled config. +is_cross() { [ "x@cross_compiling@" = "xyes" ]; } + # Determine the base directories we require. prefix=${input_option_prefix-${this_prefix:-@prefix@}} @@ -347,7 +350,7 @@ wxconfdir="@libdir@/wx/config" installed_configs=$( cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-" ) -target="@host_alias@" +is_cross && target="@host_alias@" # Define a pseudo-hash to contain the specification of this wx-config # instance and its associated library. @@ -797,10 +800,9 @@ if ! user_mask_fits "$this_config" ; then EOF - # PIPEDREAM: This will probably give Vadim an aneurysm if I - # mention it out of context, but from here we are actually - # just a teensy step from simply building the missing config - # for the user on the fly if this is an in tree wx-config. + # PIPEDREAM: from here we are actually just a teensy step + # from simply building the missing config for the user + # on the fly if this is an in tree wx-config. exit 1 fi @@ -881,7 +883,6 @@ bindir="@bindir@" # The rest are going to need a little more work. # -------------------------------------------------------------- -is_cross() { [ "x@cross_compiling@" = "xyes" ]; } is_monolithic() { [ "x@MONOLITHIC@" = "x1" ]; } is_static() { [ -n "$this_linkage" ]; } is_installed() { [ -z "$this_prefix" ]; }