From 0878f8d0aab1b6e974092e9907911f53bc9ae49f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 16 Mar 2011 15:52:08 +0200 Subject: [PATCH] Revert "Revert "Use realpath on the filename being compiled to expand Cygwin symlinks"" This reverts commit b4260a9b516241dd42d992cc148235e153a66d18. --- solenv/gbuild/platform/windows.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 853f872b69f9..d1cb80bb605b 100755 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -260,7 +260,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(PCHFLAGS) \ -I$(dir $(3)) \ $(INCLUDE) \ - -c $(3) \ + -c $(realpath $(3)) \ -Fo$(1)) $(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE)) endef @@ -299,7 +299,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(PCHFLAGS) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE) \ - -c $(3) \ + -c $(realpath $(3)) \ -Fo$(1)) $(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE)) endef @@ -341,7 +341,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(4) $(5) -Fd$(PDBFILE) \ -I$(dir $(3)) \ $(6) \ - -c $(3) \ + -c $(realpath $(3)) \ -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) endef @@ -382,7 +382,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(4) $(5) -Fd$(PDBFILE) \ -I$(dir $(3)) \ $(6) \ - -c $(3) \ + -c $(realpath $(3)) \ -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) endef