From fa514885c1259015efa32860589502059316ca30 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Fri, 8 Oct 2021 22:45:44 +0200 Subject: [PATCH 1/3] fix #9 space-separated library and include paths --- cccl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cccl b/cccl index 1984385..3833066 100755 --- a/cccl +++ b/cccl @@ -121,7 +121,14 @@ EOF clopt+=("${slash}O2") ;; - -L*) + -L) + shift + path=`echo "$1"` + linkopt+=("${slash}LIBPATH:$path") + ;; + + -L) + shift path=`echo "$1" | sed 's/-L//'` linkopt+=("${slash}LIBPATH:$path") ;; @@ -217,6 +224,11 @@ EOF clopt+=("${slash}I$1") ;; + -I) + shift + clopt+=("${slash}I$1") + ;; + -rpath) #ignore this arg and the path shift From c21e1ad079126ff05775382167c41e9dc80ea161 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Fri, 8 Oct 2021 22:56:51 +0200 Subject: [PATCH 2/3] fix #10 adjusting mingw drive reference for LIBPATH --- cccl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cccl b/cccl index 3833066..b86f5f7 100755 --- a/cccl +++ b/cccl @@ -123,13 +123,13 @@ EOF -L) shift - path=`echo "$1"` + path=`echo "$1" | sed 's#/\([a-zA-Z]\)#\1:#'` linkopt+=("${slash}LIBPATH:$path") ;; -L) shift - path=`echo "$1" | sed 's/-L//'` + path=`echo "$1" | sed 's/-L//' | sed 's#/\([a-zA-Z]\)#\1:#'` linkopt+=("${slash}LIBPATH:$path") ;; From 89cff57621a7aa19e782f11c7667d343e4013f07 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Sun, 10 Oct 2021 23:22:32 +0200 Subject: [PATCH 3/3] fixes #13 and issues with previous commits additional: fix Copyright date, increment version number --- cccl | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/cccl b/cccl index b86f5f7..153f55c 100755 --- a/cccl +++ b/cccl @@ -3,7 +3,7 @@ # cccl # Wrapper around MS's cl.exe to make it act more like Unix cc # -# Copyright (C) 2000-2015 by contributors listed in the AUTHORS file. +# Copyright (C) 2000-2015,2019,2021 by contributors listed in the AUTHORS file. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -93,7 +93,7 @@ while test $# -gt 0; do --version) cat <