From 685ba637b62d2e117bb33d773e301c133cc1013e Mon Sep 17 00:00:00 2001 From: Don Stewart Date: Sat, 21 May 2005 05:48:53 +0000 Subject: [PATCH] Add -DMACOSX --- configure | 1 + configure.ac | 1 + src/plugins/System/Plugins/Env.hs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index f68b865..341450c 100644 --- a/configure +++ b/configure @@ -1347,6 +1347,7 @@ if test "$MACOSX" = "yes" then WHOLE_ARCHIVE_FLAG=-all_load LEADING_UNDERSCORE=1 + SYMS="$SYMS -DMACOSX" else WHOLE_ARCHIVE_FLAG=--whole-archive LEADING_UNDERSCORE=0 diff --git a/configure.ac b/configure.ac index 3460926..4b97a97 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,7 @@ if test "$MACOSX" = "yes" then WHOLE_ARCHIVE_FLAG=-all_load LEADING_UNDERSCORE=1 + SYMS="$SYMS -DMACOSX" else WHOLE_ARCHIVE_FLAG=--whole-archive LEADING_UNDERSCORE=0 diff --git a/src/plugins/System/Plugins/Env.hs b/src/plugins/System/Plugins/Env.hs index 04bac90..d9743cd 100644 --- a/src/plugins/System/Plugins/Env.hs +++ b/src/plugins/System/Plugins/Env.hs @@ -351,7 +351,7 @@ classifyLdInput ('-':'L':path) = return (Just (DLLPath path)) classifyLdInput _ = return Nothing -- TODO need to define a MAC/DARWIN symbol -#if defined(darwin_TARGET_OS) +#if defined(MACOSX) mkSOName root = "lib" ++ root ++ ".dylib" #elif defined(CYGWIN) || defined(__MINGW32__) -- Win32 DLLs have no .dll extension here, because addDLL tries