Commit e9b02c06 authored by ken's avatar ken
Browse files

[project @ 2001-08-04 06:09:24 by ken]

Change the generation of package.conf and package.conf.inplace, so that
-lbfd and -liberty are included when necessary.
parent 76bb1a31
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# $Id: Makefile,v 1.67 2001/07/24 10:28:51 simonmar Exp $ # $Id: Makefile,v 1.68 2001/08/04 06:09:24 ken Exp $
# #
TOP=.. TOP=..
...@@ -37,6 +37,7 @@ SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc ...@@ -37,6 +37,7 @@ SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
endif endif
SRC_HC_OPTS += -DWANT_PRETTY SRC_HC_OPTS += -DWANT_PRETTY
SRC_HC_OPTS += $(filter -D% -U%,$(GhcRtsCcOpts))
all :: package.conf package.conf.inplace all :: package.conf package.conf.inplace
......
#include "../includes/config.h" #include "../includes/config.h"
#include "../includes/Derived.h"
module Main (main) where module Main (main) where
...@@ -64,11 +65,16 @@ package_details installing ...@@ -64,11 +65,16 @@ package_details installing
then [ "$libdir" ] then [ "$libdir" ]
else [ ghc_src_dir cGHC_RUNTIME_DIR ], else [ ghc_src_dir cGHC_RUNTIME_DIR ],
hs_libraries = [ "HSrts" ], hs_libraries = [ "HSrts" ],
#ifndef mingw32_TARGET_OS extra_libraries =
extra_libraries = [ "m" ], -- libm, that is, for ldexp() "m": -- for ldexp()
#else #ifdef mingw32_TARGET_OS
extra_libraries = [ "winmm", "wsock32" ], -- winmm for the threadDelay timer, wsock32 for the linker "winmm": -- for the threadDelay timer
"wsock32": -- for the linker
#endif
#ifdef USING_LIBBFD
"bfd": "iberty": -- for debugging
#endif #endif
[],
include_dirs = if installing include_dirs = if installing
then [ "$libdir/include" then [ "$libdir/include"
#ifdef mingw32_TARGET_OS #ifdef mingw32_TARGET_OS
......
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* $Id: Derived.h,v 1.1 2001/07/26 03:08:39 ken Exp $ * $Id: Derived.h,v 1.2 2001/08/04 06:09:24 ken Exp $
* *
* (c) The GHC Team, 1998-2001 * (c) The GHC Team, 1998-2001
* *
...@@ -22,4 +22,11 @@ ...@@ -22,4 +22,11 @@
#define SUPPORT_LONG_LONGS 1 #define SUPPORT_LONG_LONGS 1
#endif #endif
/*
* Whether the runtime system will use libbfd for debugging purposes.
*/
#if defined(DEBUG) && defined(HAVE_BFD_H) && !defined(_WIN32) && !defined(PAR) && !defined(GRAN)
#define USING_LIBBFD 1
#endif
#endif /* DERIVED_H */ #endif /* DERIVED_H */
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* $Id: Printer.c,v 1.42 2001/07/24 06:31:36 ken Exp $ * $Id: Printer.c,v 1.43 2001/08/04 06:09:24 ken Exp $
* *
* (c) The GHC Team, 1994-2000. * (c) The GHC Team, 1994-2000.
* *
...@@ -818,7 +818,7 @@ static void printZcoded( const char *raw ) ...@@ -818,7 +818,7 @@ static void printZcoded( const char *raw )
/* Causing linking trouble on Win32 plats, so I'm /* Causing linking trouble on Win32 plats, so I'm
disabling this for now. disabling this for now.
*/ */
#if defined(HAVE_BFD_H) && !defined(_WIN32) && !defined(PAR) && !defined(GRAN) #ifdef USING_LIBBFD
#include <bfd.h> #include <bfd.h>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment