From d71331259a981ba51e324206c68ee246b1aa26d9 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Tue, 22 May 2018 21:55:50 +0100 Subject: [PATCH] Fix #1536 Don't assume machine which built ZNC has the same compiler as where znc-buildmod runs. The old code was needed before 3b3a0ac291861c3b3832bc155ef3c9415a269f52 --- znc-buildmod.cmake.in | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/znc-buildmod.cmake.in b/znc-buildmod.cmake.in index 4659e389..356cf01c 100755 --- a/znc-buildmod.cmake.in +++ b/znc-buildmod.cmake.in @@ -78,14 +78,7 @@ with tempfile.TemporaryDirectory() as cmdir: print(cm.read()) with tempfile.TemporaryDirectory() as build: - command = ['cmake', '-G@CMAKE_GENERATOR@', - '-DCMAKE_C_COMPILER=@CMAKE_C_COMPILER@', - '-DCMAKE_CXX_COMPILER=@CMAKE_CXX_COMPILER@', - '-DCMAKE_CXX_FLAGS={} @CMAKE_CXX_FLAGS@'.format( - os.environ.get('CXXFLAGS', '')), - '-DCMAKE_MODULE_LINKER_FLAGS={} @CMAKE_MODULE_LINKER_FLAGS@'.format( - os.environ.get('LDFLAGS', '')), - cmdir] + command = ['cmake', cmdir] if args.verbose > 1: cmd.append('--debug-output') if args.verbose > 2: