diff --git a/vcs.mk b/vcs.mk index 9367cca9..daed8af4 100644 --- a/vcs.mk +++ b/vcs.mk @@ -35,9 +35,11 @@ VCS_LDFLAGS = \ -ldramsim \ $(EXTRA_SIM_LDFLAGS) +# vcs requires LDFLAGS to not include library names (i.e. -l needs to be separate) VCS_CC_OPTS = \ -CFLAGS "$(VCS_CXXFLAGS)" \ - -LDFLAGS "$(VCS_LDFLAGS)" + -LDFLAGS "$(filter-out -l%,$(VCS_LDFLAGS))" \ + $(filter -l%,$(VCS_LDFLAGS)) VCS_NONCC_OPTS = \ -notice \ diff --git a/vlsi/hammer-synopsys-plugins b/vlsi/hammer-synopsys-plugins index bd0e5c90..706e3f6e 160000 --- a/vlsi/hammer-synopsys-plugins +++ b/vlsi/hammer-synopsys-plugins @@ -1 +1 @@ -Subproject commit bd0e5c90126cb517928082517cf9af24ec27bfbb +Subproject commit 706e3f6e8dbba8f2e36b009daaf6cf9596ab68e9