Skip to content

Commit

Permalink
[build] Enable --disable-shared, link to static libparrot
Browse files Browse the repository at this point in the history
When the system did support dynamic linking we had no chance to
link against a static libparrot, as PARROT_LIBS checked for
has_dynamic_linking and not parrot_is_shared.
Note that we have no --disable-static yet, so we cannot forbid
creating a LIBPARROT_STATIC, this only relies on has_static_linking.
  • Loading branch information
Reini Urban committed Oct 17, 2014
1 parent 70fab94 commit 0eba55c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
4 changes: 3 additions & 1 deletion ChangeLog
@@ -1,4 +1,4 @@
2014-10-21 release 6.9.0
2014-10-21 release 6.9.0 - supported
- Core
+ Changed behavior with illegal escape sequences, GH #1103. Do not silently
skip the \ anymore, throw an EXCEPTION_INVALID_CHARACTER error with
Expand Down Expand Up @@ -30,6 +30,8 @@
+ Deprecated --parrot_is_shared in favor of --enable-shared. [GH #1101]
+ Change default of the config key debugging from 1 to 0, i.e. you need to provide
now --debugging[=flags] for debugging. [GH #1099]
+ Enable --disable-shared (or --parrot_is_shared=0) to link against static
libparrot [GH #1101]
- Documentation
+ Add missing manpages for pbc_disassemble, pbc_dump, pbc_merge
+ Improved src/string/encoding/tables.c pod.
Expand Down
9 changes: 2 additions & 7 deletions config/gen/makefiles/root.in
Expand Up @@ -668,7 +668,7 @@ corevm : \
$(PARROTOLD) \
$(RUN_INC_DIR)/parrotlib.pbc \
$(RUN_INC_DIR)/config.fpmc \
#IF(has_dynamic_linking): $(DYNPMC_TARGETS) \
#IF(has_dynamic_linking): $(DYNPMC_TARGETS) \
$(LIBRARY_DIR)/Test/More.pbc

gen_library : $(GEN_LIBRARY)
Expand Down Expand Up @@ -1148,14 +1148,9 @@ lib_deps_source : $(GEN_HEADERS)

lib_deps : lib_deps_object lib_deps_source

# XXX changes don't always propagate into libparrot
# e.g. when I change debug:fataly to xfataly, nm still shows the old symbol
# and parrot builds fine (except for the unproto warning
# so always delete the lib -leo

PARROT_LIBS : \
#IF(has_static_linking): $(LIBPARROT_STATIC) \
#IF(has_dynamic_linking): $(LIBPARROT_SHARED)
#IF(parrot_is_shared): $(LIBPARROT_SHARED)

#IF(cygwin):IMPORTLIB = libparrot.dll.a
#IF(win32 and cc==gcc):IMPORTLIB = libparrot.lib
Expand Down

0 comments on commit 0eba55c

Please sign in to comment.