From: ksg Date: Thu, 22 Sep 2016 03:15:08 +0000 (-0700) Subject: build system 3.0 lld fix X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=commitdiff_plain;h=61225dad24338b40104b33581fd0ea5061146dd2 build system 3.0 lld fix --- diff --git a/.gitignore b/.gitignore index d09c918..6ec091e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ bak/* include/* lib*/* Makefile~ +dist/* diff --git a/src/Makefile b/src/Makefile index 5801e30..c00b077 100644 --- a/src/Makefile +++ b/src/Makefile @@ -54,7 +54,7 @@ gccgo_LD := $(cc_LD) gccgo_AR := $(cc_AR) gccgo_AROBJ := $(cc_AROBJ) # Shell functions to determine what libraries can be linked by the compiler -cc_LDLIBS := $(shell ldconfig -p | head -n -2 | grep -v Broken | sed -e 's@^.*lib\([_\+a-Z0-9\-]*\)\..*@\1@g' -e '1d') +cc_LDLIBS := $(shell ls /usr/lib | grep ".so" | sed -e 's@^.*lib\([_\+a-zA-Z0-9\-]*\)\..*@\1@g') gcc_LDLIBS := $(cc_LDLIBS) emcc_LDLIBS := g++_LDLIBS := $(cc_LDLIBS) @@ -305,7 +305,6 @@ $(eval $1_SOURCES := $(subst ./,,$(shell find -name "*.$1"))) # (i.e. yacc/bison also produce accompanying .h files), add them to the list of # source files that this makefile can generate ('$1_MKSRC'), to later be deleted # during the clean rule. -$(info $1_SOURCES: $($1_SOURCES)) $(foreach srcl,$($1_SRCL),\ $(eval $1_MKSRC := $(shell find -name "*.$(srcl)" \ | sed -e 's@^\(.*\).$(srcl)@\1$($(srcl)_STEM:%=.%).$1@g' -e 's@\./@@'))\ @@ -314,7 +313,6 @@ $(eval $(srcl)_SOURCES += $($1_MKSRC))\ $(if $($(srcl)_DUP),\ $(eval $1_SOURCES += $($1_MKSRC:%.$1=%.$($(srcl)_DUP))))\ ) -$(info $1_SOURCES: $($1_SOURCES)) $(eval $1_DRV_SRC := $(filter $(DRIVER_DIR)/%,$($1_SOURCES))) $(eval DRV_SRC += $($1_DRV_SRC)) @@ -425,7 +423,6 @@ all: $(basename $(DRV_FNAMES)) # source files, and allow the compiler to output in its default current working # directory 'cwd'. this is done by setting the $1_CHDIR flag to 't' define SRCLANG_TRGLANG_BUILDRULE = -$(info SRCLANG_TRGLANG_BUILDRULE $1 $2) %$($1_STEM:%=.%).$2$(if $($1_DUP), %$($1_STEM:%=.%).$($1_DUP)): %.$1 $(if $($1_CHDIR),cd $$(shell dirname $$@) && )$$($1_C) $$($1_FLAGS)$(if $($1_CHDIR),\ $$(shell echo $$@ | sed -e 's@^.*/\([^\.]*\).*@\1@').$1,\