[Gptfdisk-general] [PATCH 14/15] makefile: Avoid absolute path in CXX for mingw* builds
Brought to you by:
srs5694
|
From: Bin M. <bme...@gm...> - 2022-04-02 07:01:03
|
At present CXX specifies absolute path for the MinGW GCC compiler.
But it only applies to MinGW cross compiler on the Linux host.
On a Windows host with MSYS2, MinGW GCC is normally installed at
/mingw{32,64}/bin which does not work with current makefile.
Remove the absolute path prefix, as on both Linux and Windows hosts
MinGW GCC compiler path is already in the PATH environment.
Signed-off-by: Bin Meng <bme...@gm...>
---
Makefile.mingw | 4 ++--
Makefile.mingw64 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.mingw b/Makefile.mingw
index 7492598..eaed728 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,5 +1,5 @@
-CXX=/usr/bin/i686-w64-mingw32-g++
-STRIP=/usr/bin/i686-w64-mingw32-strip
+CXX=i686-w64-mingw32-g++
+STRIP=i686-w64-mingw32-strip
CXXFLAGS=-O2 -Wall -D_FILE_OFFSET_BITS=64
#CXXFLAGS=-O2 -Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include -I/opt/local/include
LDFLAGS+=
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index 202690e..45a61cb 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -1,5 +1,5 @@
-CXX=/usr/bin/x86_64-w64-mingw32-g++
-STRIP=/usr/bin/x86_64-w64-mingw32-strip
+CXX=x86_64-w64-mingw32-g++
+STRIP=x86_64-w64-mingw32-strip
CXXFLAGS=-O2 -Wall -D_FILE_OFFSET_BITS=64
#CXXFLAGS=-O2 -Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include -I/opt/local/include
LDFLAGS+=
--
2.25.1
|