Wireshark-commits: [Wireshark-commits] master e696d0f: Fix the checks for the Cygwin path.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 1 Jul 2014 20:19:05 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e696d0f93d7a86c43e8fac8f905cc7a0f18ef797
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

e696d0f by Guy Harris (guy@xxxxxxxxxxxx):

    Fix the checks for the Cygwin path.
    
    I.e., do
    
    	if we have 32-bit Cygwin
    		CYGWIN_PATH=path to it
    	else if we have 64-bit Cygwin
    		CYGWIN_PATH=path to it
    	else
    		fail
    	endif
    
    rather than
    
    	CYGWIN_PATH=standard path for 32-bit Cygwin
    	if we don't have 32-bit cygwin and we do have 64-bit Cygwin
    		CYGWIN_PATH=path to 64-bit cygwin
    	else
    		fail
    	endif
    
    as the latter will fail if we *do* have 32-bit Cygwin.
    
    Change-Id: I42d607a1319263edcc1d6e546b813862b7d33ffa
    Reviewed-on: https://code.wireshark.org/review/2756
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  aa0f809   Don't check for -Wl,{option} support.
    adds  e696d0f   Fix the checks for the Cygwin path.


Summary of changes:
 config.nmake |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)