Changeset 14429


Ignore:
Timestamp:
Oct 5, 2005, 7:31:25 AM (15 years ago)
Author:
pguyot (Paul Guyot)
Message:

Instead of filtering out, filter the environment variables in.
Also fixed some copy/paste bug.

Bug:
Submitted by: blb@
Reviewed by:
Approved by: mww@
Obtained from:

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/darwinports1.0/darwinports.tcl

    r14168 r14429  
    11# darwinports.tcl
    2 # $Id: darwinports.tcl,v 1.195 2005/09/20 04:35:43 jberry Exp $
     2# $Id: darwinports.tcl,v 1.196 2005/10/05 07:31:25 pguyot Exp $
    33#
    44# Copyright (c) 2002 Apple Computer, Inc.
     
    418418   
    419419    # ENV cleanup.
    420     # Remove:
    421     # - P4*
    422     # - LANG
    423     # - LC*
    424     # - BZIP
    425     array unset env "P4*"
    426     array unset env "LANG"
    427     array unset env "LC*"
    428     array unset env "BZIP"
     420        set keepenvkeys { DISPLAY DYLD_FALLBACK_FRAMEWORK_PATH
     421                          DYLD_FALLBACK_LIBRARY_PATH DYLD_FRAMEWORK_PATH
     422                          DYLD_LIBRARY_PATH HOME LD_PREBIND
     423                          LD_PREBIND_ALLOW_OVERLAP MASTER_SITE_LOCAL
     424                          PATCH_SITE_LOCAL PATH PORTSRC TMP TMPDIR USER GROUP
     425        }
     426
     427        foreach envkey [array names env] {
     428                if {[lsearch $keepenvkeys $envkey] == -1} {
     429                        array unset env $envkey
     430                }
     431        }
    429432
    430433        if {![info exists xcodeversion] || ![info exists xcodebuildcmd]} {
     
    806809        lappend search_path /lib /usr/lib /usr/X11R6/lib ${prefix}/lib
    807810        if {[info exists env(DYLD_FALLBACK_LIBRARY_PATH)]} {
    808             lappend search_path $env(DYLD_LIBRARY_PATH)
     811            lappend search_path $env(DYLD_FALLBACK_LIBRARY_PATH)
    809812        }
    810813
Note: See TracChangeset for help on using the changeset viewer.