Skip to content
This repository has been archived by the owner on Sep 4, 2019. It is now read-only.

Commit

Permalink
Move libraries that should be dynamically linked after the static ones
Browse files Browse the repository at this point in the history
to match the compilation flags
  • Loading branch information
hungc committed Jul 23, 2012
1 parent 12d97c5 commit 8bda632
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions libs/regex/test/regress/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ include $(MKFILES_ROOT)/qtargets.mk

include ../../../../../rim_postset.mk

# This allows for dynamic linking without static libraries being present
LIBS+=icuuc
LIBS+=icui18n
LIBS+=icudata
LIBS+=m

# Use the QNX build system's $(VARIANT_LIST) to determine whether to use
# debugging libraries, etc.
ifeq ($(filter g,$(VARIANT_LIST)),g)
Expand All @@ -68,6 +62,12 @@ else
LIBPOST_boost_regex_recursive = -Bdynamic
endif

# Adding to LIBS in this section allows for dynamic linking without static libraries being present
LIBS+=icuuc
LIBS+=icui18n
LIBS+=icudata
LIBS+=m

ifeq ($(CPU),arm)
ifeq ($(filter g,$(VARIANT_LIST)),g)
EXTRA_LIBVPATH+=$(PROJECT_ROOT)/../../build/$(CPU)/a-le-v7-g
Expand Down

0 comments on commit 8bda632

Please sign in to comment.