All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 9d61684c authored by Robert Ricci's avatar Robert Ricci

Merge remote branch 'cody/linux-build-fix'

parents 40748a3b e3e46eca
...@@ -15,6 +15,7 @@ SUBDIRS = program-agent link-agent tevc proxy linktest ...@@ -15,6 +15,7 @@ SUBDIRS = program-agent link-agent tevc proxy linktest
ifneq ($(SYSTEM),CYGWIN_NT-5.1) ifneq ($(SYSTEM),CYGWIN_NT-5.1)
SUBDIRS += trafgen SUBDIRS += trafgen
endif endif
ifeq ($(SYSTEM),FreeBSD)
ifeq ($(WITH_EMULAB),1) ifeq ($(WITH_EMULAB),1)
# only in a full build for now. # only in a full build for now.
ifneq ($(FBSDMAJ),8) ifneq ($(FBSDMAJ),8)
...@@ -22,6 +23,7 @@ ifneq ($(FBSDMAJ),8) ...@@ -22,6 +23,7 @@ ifneq ($(FBSDMAJ),8)
SUBDIRS += delay-agent SUBDIRS += delay-agent
endif endif
endif endif
endif
all: trafgen-fetch all-subdirs all: trafgen-fetch all-subdirs
......
Markdown is supported
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