diff --git a/Makefile b/Makefile index 401be98b4676d4a25bd0738e00b768693c1fb61f..b86c214d76d73a4172ee281ae0e1418ad2d115ae 100644 --- a/Makefile +++ b/Makefile @@ -242,7 +242,6 @@ endif ifneq ($(findstring BSD,$(OSARCH)),) _ASTCFLAGS+=-I/usr/local/include - _ASTLDFLAGS+=-L/usr/local/lib endif ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) @@ -304,7 +303,7 @@ else # These are used for all but Darwin SOLINK=-shared ifneq ($(findstring BSD,$(OSARCH)),) - LDFLAGS+=-L/usr/local/lib + _ASTLDFLAGS+=-L/usr/local/lib endif endif @@ -407,10 +406,10 @@ res: main endif $(MOD_SUBDIRS): - @_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all + @_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all $(OTHER_SUBDIRS): - @_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all + @_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all defaults.h: makeopts @build_tools/make_defaults_h > $@.tmp