Skip to content

Commit

Permalink
Disabling build of static runtime since I can't seem to get a static …
Browse files Browse the repository at this point in the history
…library libXaw.a (Athena widgets).
  • Loading branch information
rptb1 committed May 18, 2013
1 parent d380cfd commit 4799e00
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/rts/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,12 @@ DEPENDDIR = depend/$(ARCH)/$(OS)
ifeq "$(NTTYPE)" "TRUE"
RUNTIMES = runtime runtime-g runtime-windows runtime-windows-g
else
ifeq "$(OS)" "Linux"
RUNTIMES = runtime runtime-g
else
RUNTIMES = runtime runtime-g runtime-static
endif
endif

all: $(GENERATED) $(RUNTIMES)
generated: $(GENERATED)
Expand Down Expand Up @@ -649,12 +653,15 @@ endif

ifeq "$(NTTYPE)" "TRUE"
else
ifeq "$(OS)" "Linux" # Can't find libXaw.a on Ubuntu 12
else
$(TARGETDIR)/main-static: $(OBJECTSSTATIC)
@echo 'MAKE: $@'
@$(MKDIR) $(TARGETDIR) $(MKDIREND)
@$(LINK) -Xlinker -Bstatic $(LINKFLAGS)$@ $(OBJECTSSTATIC) $(LIBRARIESSTATIC) $(LINKENDFLAGS)
@$(STRIP) $@
endif
endif



Expand Down Expand Up @@ -758,10 +765,13 @@ endif

ifeq "$(NTTYPE)" "TRUE"
else
ifeq "$(OS)" "Linux" # Can't find libXaw.a on Ubuntu 12
else
runtime-static: force $(TARGETDIR)/main-static
@$(RM) $@
$(LN) -s $(TARGETDIR)/main-static $@
endif
endif

ifeq "$(OS)" "SunOS"
runtime-g: old-runtime-g
Expand Down

0 comments on commit 4799e00

Please sign in to comment.