From 4abb96fb546b5975c74ff2cc295255fe17126287 Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 17 Apr 2015 05:05:52 +0200 Subject: Fix path detection with --std= parameter Fixes path detection when compilers have been told to follow a standard, e.g. with -DCMAKE_CXX_FLAGS=--std=c++98. To see the passed defines, try this with and without the --std parameter: gcc -E -dM --std=c99 - < /dev/null | grep linux --- src/porting.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/porting.cpp') diff --git a/src/porting.cpp b/src/porting.cpp index 86d5bf5da..812f148da 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -369,7 +369,7 @@ void initializePaths() /* Linux */ - #elif defined(linux) + #elif defined(linux) || defined(__linux) char buf[BUFSIZ]; memset(buf, 0, BUFSIZ); @@ -465,7 +465,7 @@ void initializePaths() /* Linux */ - #elif defined(linux) + #elif defined(linux) || defined(__linux) // Get path to executable std::string bindir = ""; -- cgit v1.2.3