Permalink
Browse files

Fix 2 dependency issues in the Makefile.

1. Debug symbols need to exist in order for the ELF file to link to
them.

2. Bytecode compilation requires the grammar pickle.  Remove manual
workarounds.
  • Loading branch information...
Andy Chu
Andy Chu committed Mar 18, 2018
1 parent 173ea98 commit a530f30632e8e8a25ab0ba96b635c8340477d2e4
Showing with 7 additions and 7 deletions.
  1. +3 −2 Makefile
  2. +0 −1 opy/smoke.sh
  3. +4 −2 portable-rules.mk
  4. +0 −2 scripts/release.sh
View
@@ -134,9 +134,10 @@ _build/%/ovm-opt: _build/%/module_init.c _build/%/main_name.c \
$(COMPILE_SH) build-opt $@ $(filter-out $(COMPILE_SH),$^)
# NOTE: This gets run on the end user's machine! It requires binutils for now?
_build/%/ovm-opt.stripped: _build/%/ovm-opt
# NOTE: objcopy fails if the linked files does not exist!
_build/%/ovm-opt.stripped: _build/%/ovm-opt _build/%/ovm-opt.symbols
#strip -o $@ --strip-debug $^
strip -o $@ $^ # What's the difference with debug symbols?
strip -o $@ _build/$*/ovm-opt # What's the difference with debug symbols?
# We need a relative path since it will be _bin/oil.ovm
objcopy --add-gnu-debuglink=_build/$*/ovm-opt.symbols $@
View
@@ -274,7 +274,6 @@ hash-determinism-loop() {
rebuild-and-md5() {
cd ..
make clean-repo
make _build/opy/py27.grammar.pickle
make _bin/oil.ovm-dbg
local out=_tmp/pyc-md5.txt
build/metrics.sh pyc-md5 | sort -n | tee $out
View
@@ -64,9 +64,11 @@ _build/%/all-deps-c.txt: build/static-c-modules.txt _build/%/app-deps-c.txt
# NOTE: This should really depend on all the .py files.
# I should make a _build/oil/py.d file and include it?
# This depends on the grammar pickle because it's the first one that calls opy compile.
_build/%/opy-app-deps.txt: \
_build/py-to-compile.txt _build/%/py-to-compile.txt
sort $^ | uniq | opy/build.sh compile-manifest _build/$*/bytecode-opy > $@
_build/opy/py27.grammar.pickle _build/py-to-compile.txt _build/%/py-to-compile.txt
# exclude the pickle
sort $(filter-out $<,$^) | uniq | opy/build.sh compile-manifest _build/$*/bytecode-opy > $@
PY27 := Python-2.7.13
View
@@ -174,8 +174,6 @@ benchmark-build() {
_clean
_dev-build
make _build/opy/py27.grammar.pickle
_release-build
}

0 comments on commit a530f30

Please sign in to comment.