From 2e61160983f32ba840b2246d3c3850c44626ab0d Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 14 Jan 2022 16:35:10 +0800 Subject: [PATCH] Don't link with msrdriver.c on non-Windows platform. (#159) This simplify the procedure of sanitizing unneeded blob in source. --- configure.ac | 11 +++++++++++ libcpuid/CMakeLists.txt | 5 ++++- libcpuid/Makefile.am | 7 +++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4ed7f836..112532db 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,17 @@ if test "x$GCC" = "xyes"; then AM_LDFLAGS="$AM_LDFLAGS -g -Wall" fi +AC_CANONICAL_HOST + +build_windows=no + +case "${host_os}" in + cygwin*|mingw*) + build_windows=yes + ;; +esac + +AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"]) AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_LDFLAGS) diff --git a/libcpuid/CMakeLists.txt b/libcpuid/CMakeLists.txt index 8cebc26c..4c44fd37 100644 --- a/libcpuid/CMakeLists.txt +++ b/libcpuid/CMakeLists.txt @@ -5,9 +5,12 @@ set(cpuid_sources rdtsc.c libcpuid_util.c rdmsr.c - msrdriver.c asm-bits.c) +if(WIN32) + list(APPEND cpuid_sources msrdriver.c) +endif() + if("${MSVC_CXX_ARCHITECTURE_ID}" MATCHES "x64") list(APPEND cpuid_sources masm-x64.asm) endif() diff --git a/libcpuid/Makefile.am b/libcpuid/Makefile.am index d1d70013..d74469e7 100644 --- a/libcpuid/Makefile.am +++ b/libcpuid/Makefile.am @@ -13,8 +13,11 @@ libcpuid_la_SOURCES = \ rdtsc.c \ asm-bits.c \ libcpuid_util.c \ - rdmsr.c \ - msrdriver.c + rdmsr.c + +if WINDOWS +libcpuid_la_SOURCES += msrdriver.c +endif libcpuid_la_DEPENDENCIES = \ $(srcdir)/libcpuid.sym