From b38e81d2617f8c50ca8bdc7181d0bb355b7d306c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 4 Apr 2017 17:42:10 +0200 Subject: [PATCH] Fix build-stack revision path (3d952b095) --- wscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wscript b/wscript index 2f4cd10661..94a0206d69 100644 --- a/wscript +++ b/wscript @@ -287,10 +287,10 @@ def create_stored_revision(): def get_depstack_rev(depstack_root): try: - with open(depstack_root + '/.vers', 'r') as f: + with open(depstack_root + '/../.vers', 'r') as f: return f.readline() except IOError: - return ''; + return '-unknown-'; def set_compiler_flags (conf,opt): # @@ -859,7 +859,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', [prefinclude ]) conf.env.append_value('LINKFLAGS', [ preflib ]) autowaf.display_msg(conf, 'Will build against private GTK dependency stack in ' + user_gtk_root, 'yes') - conf.env['DEPSTACK_REV'] = get_depstack_rev (user_gtk_root) + conf.env['DEPSTACK_REV'] = get_depstack_rev (Options.options.depstack_root) else: autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no') conf.env['DEPSTACK_REV'] = '-system-'