diff --git a/common/wrappers/cc b/common/wrappers/cc
index 559257602c6..0818c450de1 100644
--- a/common/wrappers/cc
+++ b/common/wrappers/cc
@@ -8,12 +8,30 @@ ARGS=("$@")
 i=0
 while [ $i -lt ${#ARGS[@]} ]; do
 	arg="${ARGS[$i]}"
-	if [ "$arg" = "-I/usr/include" -o "$arg" = "-L/usr/lib" ]; then
+	if [ "$incpath" ]; then
+		if [ "$arg" = "/usr/include" ]; then
+			echo "[cc-wrapper] ignoring -I $arg"
+			unset incpath
+		else
+			MYARGS+=("-I${arg}")
+		fi
+	elif [ "$libpath" ]; then
+		if [ "$arg" = "/usr/lib" ]; then
+			echo "[cc-wrapper] ignoring -L $arg"
+			unset libpath
+		else
+			MYARGS+=("-L${arg}")
+		fi
+	elif [ "$arg" = "-I" ]; then
+		incpath=1
+	elif [ "$arg" = "-L" ]; then
+		libpath=1
+	elif [ "$arg" = "-I/usr/include" -o "$arg" = "-L/usr/lib" ]; then
 		echo "[cc-wrapper] ignoring $arg"
 	else
 		MYARGS+=("${arg}")
 	fi
 	i=$((i+1))
 done
-#echo "[cc-wrapper] ${MYARGS[@]}"
+#echo "[cc-wrapper] @BIN@ ${MYARGS[@]}"
 exec @BIN@ "${MYARGS[@]}"