From 9f41db3fd73c2fe543197b49670f508a46442622 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 6 Jun 2006 20:51:23 +0000 Subject: [PATCH] use LDFLAGS for 3m build svn: r3255 --- src/mred/gc2/Makefile.in | 2 +- src/mzscheme/gc2/Makefile.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mred/gc2/Makefile.in b/src/mred/gc2/Makefile.in index c51f5ac7db..623df833d7 100644 --- a/src/mred/gc2/Makefile.in +++ b/src/mred/gc2/Makefile.in @@ -38,7 +38,7 @@ NOGCINC = $(WXINC) -I$(PLTSRCDIR)/mred/wxme/ -I$(PLTBUILDDIR)/mzscheme/ -I$(PLTS INC = -I$(PLTSRCDIR)/mzscheme/$(GCDIRECTORY) $(NOGCINC) CXXFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@ CFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ -LDFLAGS = $(XLIB) +LDFLAGS = @LDFLAGS@ $(XLIB) ########################### CPP = @CPP@ diff --git a/src/mzscheme/gc2/Makefile.in b/src/mzscheme/gc2/Makefile.in index d35eb005ec..d4e988544b 100644 --- a/src/mzscheme/gc2/Makefile.in +++ b/src/mzscheme/gc2/Makefile.in @@ -300,7 +300,7 @@ EXTRA_OBJS_L = ../src/gmp.@LTO@ @FOREIGN_OBJSLIB_IF_USED@ $(RANLIB) ../libmzscheme3m.@LIBSFX@ ../mzscheme3m@NOT_OSX@: main.@LTO@ ../libmzscheme3m.@LIBSFX@ - @MZLINKER@ -o ../mzscheme3m @PROFFLAGS@ main.@LTO@ ../libmzscheme3m.@LIBSFX@ $(LIBS) + @MZLINKER@ -o ../mzscheme3m @PROFFLAGS@ main.@LTO@ ../libmzscheme3m.@LIBSFX@ @LDFLAGS@ $(LIBS) MZFWMMM = PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme @@ -308,7 +308,7 @@ $(MZFWMMM): ../libmzscheme3m.@LIBSFX@ if [ ! -d PLT_MzScheme.framework ] ; then mkdir PLT_MzScheme.framework ; fi if [ ! -d PLT_MzScheme.framework/Versions ] ; then mkdir PLT_MzScheme.framework/Versions ; fi if [ ! -d PLT_MzScheme.framework/Versions/$(FWVERSION)_3m ] ; then mkdir PLT_MzScheme.framework/Versions/$(FWVERSION)_3m ; fi - $(CC) -o $(MZFWMMM) -framework CoreFoundation -dynamiclib -all_load ../libmzscheme3m.@LIBSFX@ $(LIBS) + $(CC) -o $(MZFWMMM) -framework CoreFoundation -dynamiclib -all_load ../libmzscheme3m.@LIBSFX@ @LDFLAGS@ $(LIBS) rm -f PLT_MzScheme.framework/PLT_MzScheme ln -s Versions/$(FWVERSION)_3m/PLT_MzScheme PLT_MzScheme.framework/PLT_MzScheme